Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of BigPlugin from 7_2_X. #5154

Merged
merged 1 commit into from Sep 4, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 25 additions & 0 deletions BigProducts/Simulation/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<use name="SimG4CMS/Calo"/>
<use name="SimG4CMS/FP420"/>
<use name="SimG4CMS/Forward"/>
<use name="SimG4CMS/Muon"/>
<use name="SimG4CMS/Tracker"/>
<use name="SimG4Core/Application"/>
<use name="SimG4Core/CustomPhysics"/>
<use name="SimG4Core/Generators"/>
<use name="SimG4Core/Geometry"/>
<use name="SimG4Core/HelpfulWatchers"/>
<use name="SimG4Core/MagneticField"/>
<use name="SimG4Core/Notification"/>
<use name="SimG4Core/Physics"/>
<use name="SimG4Core/PhysicsLists"/>
<use name="SimG4Core/SensitiveDetector"/>
<use name="SimRomanPot/SimFP420"/>
<use name="Validation/HcalHits"/>
<use name="Validation/EcalHits"/>
<use name="SimDataFormats/ValidationFormats"/>
<use name="geant4static"/>
<flags DROP_DEP="geant4core"/>
# Hack needed to avoid undefined variable in CLHEP.
<architecture name="slc6_amd64_gcc49">
<flags REM_CXXFLAGS="-Werror=unused-variable"/>
</architecture>
8 changes: 4 additions & 4 deletions SimG4CMS/Calo/interface/HFGflash.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ class HFGflash {
struct Hit {
Hit() {}
G4ThreeVector position;
int depth;
double time;
double edep;
double pez;
int depth = 0;
double time = 0.;
double edep = 0.;
double pez = 0.;
};

std::vector<Hit> gfParameterization(G4Step * aStep, bool & ok, bool onlyLong=false);
Expand Down