From f8bb3199d6c67000e33f3d6656328b8bfb666f30 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 6 Jul 2020 10:29:45 -0500 Subject: [PATCH 1/5] removing cout leftover and unused comments --- src/geant4/DagSolid.cc | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/geant4/DagSolid.cc b/src/geant4/DagSolid.cc index 84d2116937..8e6bda1b1e 100644 --- a/src/geant4/DagSolid.cc +++ b/src/geant4/DagSolid.cc @@ -47,7 +47,6 @@ // // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -//#include "G4TessellatedSolid.hh" #include "DagSolid.hh" #include "globals.hh" #include "Randomize.hh" @@ -84,11 +83,6 @@ DagSolid::DagSolid() yMaxExtent = -kInfinity; zMinExtent = kInfinity; zMaxExtent = -kInfinity; -//G4TessellatedSolid -// SetRandomVectors(); - - // SetRndVectors(); - } @@ -129,12 +123,9 @@ DagSolid::DagSolid(const G4String& name, DagMC* dagmc, int volID) moab->get_child_meshsets(fvolEntity, surfs, 1); if (plot) { - // G4cout<<"please wait for visualization... "<get_number_entities_by_type(surfs[i], MBTRI, num_entities); - //G4cout<<"Number of triangles = "<index_by_handle(surfs[i])<get_entities_by_type(surfs[i], MBTRI, tris); @@ -142,14 +133,11 @@ DagSolid::DagSolid(const G4String& name, DagMC* dagmc, int volID) moab->get_connectivity(tris[j], tri_conn, n_verts); moab->get_coords(tri_conn, n_verts, coords[0].array()); - // G4cout<<"add facet for vis = "< Date: Tue, 7 Jul 2020 12:15:47 -0500 Subject: [PATCH 2/5] removing commented pieces of the code --- src/geant4/DagSolid.hh | 13 -- .../app/include/ExN01DetectorConstruction.hh | 9 - src/geant4/app/include/ExN01DetectorHit.hh | 15 +- .../include/ExN01PrimaryGeneratorAction.hh | 1 - src/geant4/app/src/DagSolidTally.cc | 1 - .../app/src/ExN01DetectorConstruction.cc | 199 ++++++++---------- src/geant4/app/src/ExN01DetectorHit.cc | 13 -- .../app/src/ExN01PrimaryGeneratorAction.cc | 31 --- src/geant4/app/src/ExN01RunAction.cc | 1 - src/geant4/app/src/ExN01SensitiveDetector.cc | 14 +- 10 files changed, 95 insertions(+), 202 deletions(-) diff --git a/src/geant4/DagSolid.hh b/src/geant4/DagSolid.hh index 1666ab8de9..c64a8ab300 100644 --- a/src/geant4/DagSolid.hh +++ b/src/geant4/DagSolid.hh @@ -99,12 +99,6 @@ class DagSolid : public G4TessellatedSolid { G4double& pMin, G4double& pMax) const; virtual std::ostream& StreamInfo(std::ostream& os) const; - - -// virtual void ComputeDimensions (G4VPVParameterisation* p, const G4int n, -// const G4VPhysicalVolume* pRep); - - virtual G4double GetCubicVolume(); virtual G4double GetSurfaceArea(); G4double GetMinXExtent() const; @@ -117,8 +111,6 @@ class DagSolid : public G4TessellatedSolid { virtual void DescribeYourselfTo(G4VGraphicsScene& scene) const; - - public: // without description DagSolid(__void__&); @@ -126,17 +118,13 @@ class DagSolid : public G4TessellatedSolid { // persistency for clients requiring preallocation of memory for // persistifiable objects. - - protected: // with description void DeleteObjects(); void CopyObjects(const DagSolid& s); - private: - G4GeometryType geometryType; G4double cubicVolume; G4double surfaceArea; @@ -147,7 +135,6 @@ class DagSolid : public G4TessellatedSolid { G4double zMinExtent; G4double zMaxExtent; - G4String Myname; DagMC* fdagmc; diff --git a/src/geant4/app/include/ExN01DetectorConstruction.hh b/src/geant4/app/include/ExN01DetectorConstruction.hh index d61b6834fc..9d6edc4d67 100644 --- a/src/geant4/app/include/ExN01DetectorConstruction.hh +++ b/src/geant4/app/include/ExN01DetectorConstruction.hh @@ -50,15 +50,6 @@ class ExN01DetectorConstruction : public G4VUserDetectorConstruction { UWUW* workflow_data; - // DAG Logical volumes - // G4LogicalVolume* dag_vol_log; - - // Physical volumes - // - // G4VPhysicalVolume* world_volume_phys; - // DAG Physical volumes - - }; #endif diff --git a/src/geant4/app/include/ExN01DetectorHit.hh b/src/geant4/app/include/ExN01DetectorHit.hh index 274b4ba72d..f5446d5da9 100644 --- a/src/geant4/app/include/ExN01DetectorHit.hh +++ b/src/geant4/app/include/ExN01DetectorHit.hh @@ -37,11 +37,7 @@ class ExN01DetectorHit : public G4VHit { void SetTrackID(G4int track) { fTrackID = track; }; - /* - void SetChamberNb(G4int chamb) { fChamberNb = chamb; }; - void SetEdep (G4double de) { fEdep = de; }; - void SetPos (G4ThreeVector xyz){ fPos = xyz; }; - */ + void SetParticleEnergy(G4double ke) { fKe = ke; }; @@ -62,11 +58,7 @@ class ExN01DetectorHit : public G4VHit { G4int GetTrackID() const { return fTrackID; }; - /* - G4int GetChamberNb() const { return fChamberNb; }; - G4double GetEdep() const { return fEdep; }; - G4ThreeVector GetPos() const { return fPos; }; - */ + G4double GetKE() const { return fKe; }; @@ -86,9 +78,6 @@ class ExN01DetectorHit : public G4VHit { private: G4int fTrackID; -// G4int fChamberNb; -// G4double fEdep; -// G4ThreeVector fPos; G4double fKe; G4double fTl; G4double fWeight; diff --git a/src/geant4/app/include/ExN01PrimaryGeneratorAction.hh b/src/geant4/app/include/ExN01PrimaryGeneratorAction.hh index 7f87a51f24..a44dcd67db 100644 --- a/src/geant4/app/include/ExN01PrimaryGeneratorAction.hh +++ b/src/geant4/app/include/ExN01PrimaryGeneratorAction.hh @@ -21,7 +21,6 @@ class ExN01PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction { void GeneratePrimaries(G4Event* anEvent); private: - // G4ParticleGun* particleGun; G4GeneralParticleSource* fParticleGun; }; diff --git a/src/geant4/app/src/DagSolidTally.cc b/src/geant4/app/src/DagSolidTally.cc index acd28e625f..f5d9129609 100644 --- a/src/geant4/app/src/DagSolidTally.cc +++ b/src/geant4/app/src/DagSolidTally.cc @@ -11,7 +11,6 @@ std::map load_uwuw_tallies(std::string filepath) { std::cout << filepath << std::endl; while (!end) { pyne::Tally tally; // from file - std::cout << i << std::endl; tally.from_hdf5(filepath, "/tally", i++); if (tally_library.count(tally.tally_name)) { end = true; diff --git a/src/geant4/app/src/ExN01DetectorConstruction.cc b/src/geant4/app/src/ExN01DetectorConstruction.cc index dbab1d2d09..deb7337926 100644 --- a/src/geant4/app/src/ExN01DetectorConstruction.cc +++ b/src/geant4/app/src/ExN01DetectorConstruction.cc @@ -295,123 +295,104 @@ void ExN01DetectorConstruction::add_histogram_description(std::string tally_name /* // add ebins for the given tally eventually - std::vector bin_bounds={1.000000E-14,2.000000E-13,2.929734E-13,4.291671E-13,6.286727E-13, - 9.209218E-13,1.349028E-12,1.976147E-12,2.894792E-12,4.240485E-12, - 6.211746E-12,9.099382E-12,1.332938E-11,1.952578E-11,2.860266E-11, - 4.189910E-11,6.137660E-11,8.990856E-11,1.317041E-10,1.929290E-10, - 2.826153E-10,4.139938E-10,5.315785E-10,6.250621E-10,6.825603E-10, - 8.336811E-10,8.764248E-10,1.125352E-9,1.444980E-9,1.855391E-9, - 2.382370E-9,3.059023E-9,3.927864E-9,5.043477E-9,6.475952E-9, - 8.315287E-9,1.067704E-8,1.370959E-8,1.760346E-8,2.260329E-8, - 2.902320E-8,3.726653E-8,4.785117E-8,6.144212E-8,7.889325E-8, - 1.013009E-7,1.300730E-7,1.670170E-7,2.144541E-7,2.753645E-7, - 3.535750E-7,4.539993E-7,5.829466E-7,7.485183E-7,9.611165E-7, - 1.234098E-6,1.363889E-6,1.507331E-6,1.584613E-6,1.665858E-6, - 1.841058E-6,2.034684E-6,2.248673E-6,2.485168E-6,2.612586E-6, - 2.746536E-6,2.863488E-6,3.035391E-6,3.354626E-6,3.707435E-6, - 4.097350E-6,4.307425E-6,4.528272E-6,5.004514E-6,5.530844E-6, - 6.267267E-6,7.101744E-6,8.047330E-6,9.118820E-6,1.033298E-5, - 1.170880E-5,1.326780E-5,1.503439E-5,1.703620E-5,1.930454E-5, - 2.133482E-5,2.187491E-5,2.357862E-5,2.417552E-5,2.478752E-5, - 2.605841E-5,2.808794E-5,3.182781E-5,3.430669E-5,3.517517E-5, - 3.606563E-5,4.086771E-5,4.630919E-5,5.247518E-5,5.656217E-5, - 5.946217E-5,6.251086E-5,6.737947E-5,7.635094E-5,8.651695E-5, - 9.803655E-5,1.110900E-4,1.167857E-4,1.227734E-4,1.290681E-4, - 1.356856E-4,1.426423E-4,1.499558E-4,1.576442E-4,1.616349E-4, - 1.657268E-4,1.699221E-4,1.742237E-4,1.831564E-4,1.925470E-4, - 2.024191E-4,2.127974E-4,2.237077E-4,2.351775E-4,2.472353E-4, - 2.599113E-4,2.732372E-4,2.801543E-4,2.872464E-4,2.945181E-4, - 3.019738E-4,3.096183E-4,3.174564E-4,3.337327E-4,3.508435E-4, - 3.688317E-4,3.877421E-4,4.076220E-4,4.285213E-4,4.504920E-4, - 4.735892E-4,4.978707E-4,5.104743E-4,5.233971E-4,5.366469E-4, - 5.502322E-4,5.784432E-4,6.081006E-4,6.392786E-4,6.720551E-4, - 7.065121E-4,7.427358E-4,7.808167E-4,8.208500E-4,8.629359E-4, - 9.071795E-4,9.536916E-4,9.616402E-4,9.778344E-4,1.002588E-3, - 1.053992E-3,1.108032E-3,1.164842E-3,1.194330E-3,1.224564E-3, - 1.287349E-3,1.353353E-3,1.422741E-3,1.495686E-3,1.533550E-3, - 1.572372E-3,1.612176E-3,1.652989E-3,1.737739E-3,1.826835E-3, - 1.873082E-3,1.920499E-3,1.969117E-3,2.018965E-3,2.122480E-3, - 2.231302E-3,2.268877E-3,2.306855E-3,2.345703E-3,2.365253E-3, - 2.385205E-3,2.425130E-3,2.465970E-3,2.592403E-3,2.725318E-3, - 2.865048E-3,3.011942E-3,3.088190E-3,3.166368E-3,3.246525E-3, - 3.328711E-3,3.499377E-3,3.678794E-3,3.867410E-3,4.065697E-3, - 4.274149E-3,4.493290E-3,4.607038E-3,4.723666E-3,4.843246E-3, - 4.965853E-3,5.220458E-3,5.488116E-3,5.769498E-3,5.915554E-3, - 5.915554E-3,6.218851E-3,6.376282E-3,6.537698E-3,6.592384E-3, - 6.647595E-3,6.703200E-3,6.872893E-3,7.046881E-3,7.225274E-3, - 7.408182E-3,7.595721E-3,7.788008E-3,7.985162E-3,8.187308E-3, - 8.394570E-3,8.607080E-3,8.824969E-3,9.048374E-3,9.277435E-3, - 9.512294E-3,9.753099E-3,1.000000E-2,1.025315E-2,1.051271E-2, - 1.077884E-2,1.105171E-2,1.133148E-2,1.161834E-2,1.191246E-2, - 1.221403E-2,1.252323E-2,1.284025E-2,1.316531E-2,1.349859E-2, - 1.384031E-2,1.419068E-2,1.454991E-2,1.491825E-2,1.529590E-2, - 1.568312E-2,1.608014E-2,1.648721E-2,1.690459E-2,1.733253E-2, - 1.777131E-2,1.822119E-2,1.868246E-2,1.915541E-2,1.964033E-2, - 2.000000E-2}; */ - G4double bin_bounds[261] = {1.000000E-14 * GeV, 2.000000E-13 * GeV, 2.929734E-13 * GeV, 4.291671E-13 * GeV, 6.286727E-13 * GeV, - 9.209218E-13 * GeV, 1.349028E-12 * GeV, 1.976147E-12 * GeV, 2.894792E-12 * GeV, 4.240485E-12 * GeV, - 6.211746E-12 * GeV, 9.099382E-12 * GeV, 1.332938E-11 * GeV, 1.952578E-11 * GeV, 2.860266E-11 * GeV, - 4.189910E-11 * GeV, 6.137660E-11 * GeV, 8.990856E-11 * GeV, 1.317041E-10 * GeV, 1.929290E-10 * GeV, - 2.826153E-10 * GeV, 4.139938E-10 * GeV, 5.315785E-10 * GeV, 6.250621E-10 * GeV, 6.825603E-10 * GeV, - 8.336811E-10 * GeV, 8.764248E-10 * GeV, 1.125352E-9 * GeV, 1.444980E-9 * GeV, 1.855391E-9 * GeV, - 2.382370E-9 * GeV, 3.059023E-9 * GeV, 3.927864E-9 * GeV, 5.043477E-9 * GeV, 6.475952E-9 * GeV, - 8.315287E-9 * GeV, 1.067704E-8 * GeV, 1.370959E-8 * GeV, 1.760346E-8 * GeV, 2.260329E-8 * GeV, - 2.902320E-8 * GeV, 3.726653E-8 * GeV, 4.785117E-8 * GeV, 6.144212E-8 * GeV, 7.889325E-8 * GeV, - 1.013009E-7 * GeV, 1.300730E-7 * GeV, 1.670170E-7 * GeV, 2.144541E-7 * GeV, 2.753645E-7 * GeV, - 3.535750E-7 * GeV, 4.539993E-7 * GeV, 5.829466E-7 * GeV, 7.485183E-7 * GeV, 9.611165E-7 * GeV, - 1.234098E-6 * GeV, 1.363889E-6 * GeV, 1.507331E-6 * GeV, 1.584613E-6 * GeV, 1.665858E-6 * GeV, - 1.841058E-6 * GeV, 2.034684E-6 * GeV, 2.248673E-6 * GeV, 2.485168E-6 * GeV, 2.612586E-6 * GeV, - 2.746536E-6 * GeV, 2.863488E-6 * GeV, 3.035391E-6 * GeV, 3.354626E-6 * GeV, 3.707435E-6 * GeV, - 4.097350E-6 * GeV, 4.307425E-6 * GeV, 4.528272E-6 * GeV, 5.004514E-6 * GeV, 5.530844E-6 * GeV, - 6.267267E-6 * GeV, 7.101744E-6 * GeV, 8.047330E-6 * GeV, 9.118820E-6 * GeV, 1.033298E-5 * GeV, - 1.170880E-5 * GeV, 1.326780E-5 * GeV, 1.503439E-5 * GeV, 1.703620E-5 * GeV, 1.930454E-5 * GeV, - 2.133482E-5 * GeV, 2.187491E-5 * GeV, 2.357862E-5 * GeV, 2.417552E-5 * GeV, 2.478752E-5 * GeV, - 2.605841E-5 * GeV, 2.808794E-5 * GeV, 3.182781E-5 * GeV, 3.430669E-5 * GeV, 3.517517E-5 * GeV, - 3.606563E-5 * GeV, 4.086771E-5 * GeV, 4.630919E-5 * GeV, 5.247518E-5 * GeV, 5.656217E-5 * GeV, - 5.946217E-5 * GeV, 6.251086E-5 * GeV, 6.737947E-5 * GeV, 7.635094E-5 * GeV, 8.651695E-5 * GeV, - 9.803655E-5 * GeV, 1.110900E-4 * GeV, 1.167857E-4 * GeV, 1.227734E-4 * GeV, 1.290681E-4 * GeV, - 1.356856E-4 * GeV, 1.426423E-4 * GeV, 1.499558E-4 * GeV, 1.576442E-4 * GeV, 1.616349E-4 * GeV, - 1.657268E-4 * GeV, 1.699221E-4 * GeV, 1.742237E-4 * GeV, 1.831564E-4 * GeV, 1.925470E-4 * GeV, - 2.024191E-4 * GeV, 2.127974E-4 * GeV, 2.237077E-4 * GeV, 2.351775E-4 * GeV, 2.472353E-4 * GeV, - 2.599113E-4 * GeV, 2.732372E-4 * GeV, 2.801543E-4 * GeV, 2.872464E-4 * GeV, 2.945181E-4 * GeV, - 3.019738E-4 * GeV, 3.096183E-4 * GeV, 3.174564E-4 * GeV, 3.337327E-4 * GeV, 3.508435E-4 * GeV, - 3.688317E-4 * GeV, 3.877421E-4 * GeV, 4.076220E-4 * GeV, 4.285213E-4 * GeV, 4.504920E-4 * GeV, - 4.735892E-4 * GeV, 4.978707E-4 * GeV, 5.104743E-4 * GeV, 5.233971E-4 * GeV, 5.366469E-4 * GeV, - 5.502322E-4 * GeV, 5.784432E-4 * GeV, 6.081006E-4 * GeV, 6.392786E-4 * GeV, 6.720551E-4 * GeV, - 7.065121E-4 * GeV, 7.427358E-4 * GeV, 7.808167E-4 * GeV, 8.208500E-4 * GeV, 8.629359E-4 * GeV, - 9.071795E-4 * GeV, 9.536916E-4 * GeV, 9.616402E-4 * GeV, 9.778344E-4 * GeV, 1.002588E-3 * GeV, - 1.053992E-3 * GeV, 1.108032E-3 * GeV, 1.164842E-3 * GeV, 1.194330E-3 * GeV, 1.224564E-3 * GeV, - 1.287349E-3 * GeV, 1.353353E-3 * GeV, 1.422741E-3 * GeV, 1.495686E-3 * GeV, 1.533550E-3 * GeV, - 1.572372E-3 * GeV, 1.612176E-3 * GeV, 1.652989E-3 * GeV, 1.737739E-3 * GeV, 1.826835E-3 * GeV, - 1.873082E-3 * GeV, 1.920499E-3 * GeV, 1.969117E-3 * GeV, 2.018965E-3 * GeV, 2.122480E-3 * GeV, - 2.231302E-3 * GeV, 2.268877E-3 * GeV, 2.306855E-3 * GeV, 2.345703E-3 * GeV, 2.365253E-3 * GeV, - 2.385205E-3 * GeV, 2.425130E-3 * GeV, 2.465970E-3 * GeV, 2.592403E-3 * GeV, 2.725318E-3 * GeV, - 2.865048E-3 * GeV, 3.011942E-3 * GeV, 3.088190E-3 * GeV, 3.166368E-3 * GeV, 3.246525E-3 * GeV, - 3.328711E-3 * GeV, 3.499377E-3 * GeV, 3.678794E-3 * GeV, 3.867410E-3 * GeV, 4.065697E-3 * GeV, - 4.274149E-3 * GeV, 4.493290E-3 * GeV, 4.607038E-3 * GeV, 4.723666E-3 * GeV, 4.843246E-3 * GeV, - 4.965853E-3 * GeV, 5.220458E-3 * GeV, 5.488116E-3 * GeV, 5.769498E-3 * GeV, 5.915554E-3 * GeV, - 6.050000E-3 * GeV, 6.218851E-3 * GeV, 6.376282E-3 * GeV, 6.537698E-3 * GeV, 6.592384E-3 * GeV, - 6.647595E-3 * GeV, 6.703200E-3 * GeV, 6.872893E-3 * GeV, 7.046881E-3 * GeV, 7.225274E-3 * GeV, - 7.408182E-3 * GeV, 7.595721E-3 * GeV, 7.788008E-3 * GeV, 7.985162E-3 * GeV, 8.187308E-3 * GeV, - 8.394570E-3 * GeV, 8.607080E-3 * GeV, 8.824969E-3 * GeV, 9.048374E-3 * GeV, 9.277435E-3 * GeV, - 9.512294E-3 * GeV, 9.753099E-3 * GeV, 1.000000E-2 * GeV, 1.025315E-2 * GeV, 1.051271E-2 * GeV, - 1.077884E-2 * GeV, 1.105171E-2 * GeV, 1.133148E-2 * GeV, 1.161834E-2 * GeV, 1.191246E-2 * GeV, - 1.221403E-2 * GeV, 1.252323E-2 * GeV, 1.284025E-2 * GeV, 1.316531E-2 * GeV, 1.349859E-2 * GeV, - 1.384031E-2 * GeV, 1.419068E-2 * GeV, 1.454991E-2 * GeV, 1.491825E-2 * GeV, 1.529590E-2 * GeV, - 1.568312E-2 * GeV, 1.608014E-2 * GeV, 1.648721E-2 * GeV, 1.690459E-2 * GeV, 1.733253E-2 * GeV, - 1.777131E-2 * GeV, 1.822119E-2 * GeV, 1.868246E-2 * GeV, 1.915541E-2 * GeV, 1.964033E-2 * GeV, - 2.000000E-2 * GeV - }; + const int n_bins = 261; + G4double bin_bounds[n_bins] = { + 1.000000E-14 * GeV, 2.000000E-13 * GeV, 2.929734E-13 * GeV, + 4.291671E-13 * GeV, 6.286727E-13 * GeV, 9.209218E-13 * GeV, + 1.349028E-12 * GeV, 1.976147E-12 * GeV, 2.894792E-12 * GeV, + 4.240485E-12 * GeV, 6.211746E-12 * GeV, 9.099382E-12 * GeV, + 1.332938E-11 * GeV, 1.952578E-11 * GeV, 2.860266E-11 * GeV, + 4.189910E-11 * GeV, 6.137660E-11 * GeV, 8.990856E-11 * GeV, + 1.317041E-10 * GeV, 1.929290E-10 * GeV, 2.826153E-10 * GeV, + 4.139938E-10 * GeV, 5.315785E-10 * GeV, 6.250621E-10 * GeV, + 6.825603E-10 * GeV, 8.336811E-10 * GeV, 8.764248E-10 * GeV, + 1.125352E-9 * GeV, 1.444980E-9 * GeV, 1.855391E-9 * GeV, + 2.382370E-9 * GeV, 3.059023E-9 * GeV, 3.927864E-9 * GeV, + 5.043477E-9 * GeV, 6.475952E-9 * GeV, 8.315287E-9 * GeV, + 1.067704E-8 * GeV, 1.370959E-8 * GeV, 1.760346E-8 * GeV, + 2.260329E-8 * GeV, 2.902320E-8 * GeV, 3.726653E-8 * GeV, + 4.785117E-8 * GeV, 6.144212E-8 * GeV, 7.889325E-8 * GeV, + 1.013009E-7 * GeV, 1.300730E-7 * GeV, 1.670170E-7 * GeV, + 2.144541E-7 * GeV, 2.753645E-7 * GeV, 3.535750E-7 * GeV, + 4.539993E-7 * GeV, 5.829466E-7 * GeV, 7.485183E-7 * GeV, + 9.611165E-7 * GeV, 1.234098E-6 * GeV, 1.363889E-6 * GeV, + 1.507331E-6 * GeV, 1.584613E-6 * GeV, 1.665858E-6 * GeV, + 1.841058E-6 * GeV, 2.034684E-6 * GeV, 2.248673E-6 * GeV, + 2.485168E-6 * GeV, 2.612586E-6 * GeV, 2.746536E-6 * GeV, + 2.863488E-6 * GeV, 3.035391E-6 * GeV, 3.354626E-6 * GeV, + 3.707435E-6 * GeV, 4.097350E-6 * GeV, 4.307425E-6 * GeV, + 4.528272E-6 * GeV, 5.004514E-6 * GeV, 5.530844E-6 * GeV, + 6.267267E-6 * GeV, 7.101744E-6 * GeV, 8.047330E-6 * GeV, + 9.118820E-6 * GeV, 1.033298E-5 * GeV, 1.170880E-5 * GeV, + 1.326780E-5 * GeV, 1.503439E-5 * GeV, 1.703620E-5 * GeV, + 1.930454E-5 * GeV, 2.133482E-5 * GeV, 2.187491E-5 * GeV, + 2.357862E-5 * GeV, 2.417552E-5 * GeV, 2.478752E-5 * GeV, + 2.605841E-5 * GeV, 2.808794E-5 * GeV, 3.182781E-5 * GeV, + 3.430669E-5 * GeV, 3.517517E-5 * GeV, 3.606563E-5 * GeV, + 4.086771E-5 * GeV, 4.630919E-5 * GeV, 5.247518E-5 * GeV, + 5.656217E-5 * GeV, 5.946217E-5 * GeV, 6.251086E-5 * GeV, + 6.737947E-5 * GeV, 7.635094E-5 * GeV, 8.651695E-5 * GeV, + 9.803655E-5 * GeV, 1.110900E-4 * GeV, 1.167857E-4 * GeV, + 1.227734E-4 * GeV, 1.290681E-4 * GeV, 1.356856E-4 * GeV, + 1.426423E-4 * GeV, 1.499558E-4 * GeV, 1.576442E-4 * GeV, + 1.616349E-4 * GeV, 1.657268E-4 * GeV, 1.699221E-4 * GeV, + 1.742237E-4 * GeV, 1.831564E-4 * GeV, 1.925470E-4 * GeV, + 2.024191E-4 * GeV, 2.127974E-4 * GeV, 2.237077E-4 * GeV, + 2.351775E-4 * GeV, 2.472353E-4 * GeV, 2.599113E-4 * GeV, + 2.732372E-4 * GeV, 2.801543E-4 * GeV, 2.872464E-4 * GeV, + 2.945181E-4 * GeV, 3.019738E-4 * GeV, 3.096183E-4 * GeV, + 3.174564E-4 * GeV, 3.337327E-4 * GeV, 3.508435E-4 * GeV, + 3.688317E-4 * GeV, 3.877421E-4 * GeV, 4.076220E-4 * GeV, + 4.285213E-4 * GeV, 4.504920E-4 * GeV, 4.735892E-4 * GeV, + 4.978707E-4 * GeV, 5.104743E-4 * GeV, 5.233971E-4 * GeV, + 5.366469E-4 * GeV, 5.502322E-4 * GeV, 5.784432E-4 * GeV, + 6.081006E-4 * GeV, 6.392786E-4 * GeV, 6.720551E-4 * GeV, + 7.065121E-4 * GeV, 7.427358E-4 * GeV, 7.808167E-4 * GeV, + 8.208500E-4 * GeV, 8.629359E-4 * GeV, 9.071795E-4 * GeV, + 9.536916E-4 * GeV, 9.616402E-4 * GeV, 9.778344E-4 * GeV, + 1.002588E-3 * GeV, 1.053992E-3 * GeV, 1.108032E-3 * GeV, + 1.164842E-3 * GeV, 1.194330E-3 * GeV, 1.224564E-3 * GeV, + 1.287349E-3 * GeV, 1.353353E-3 * GeV, 1.422741E-3 * GeV, + 1.495686E-3 * GeV, 1.533550E-3 * GeV, 1.572372E-3 * GeV, + 1.612176E-3 * GeV, 1.652989E-3 * GeV, 1.737739E-3 * GeV, + 1.826835E-3 * GeV, 1.873082E-3 * GeV, 1.920499E-3 * GeV, + 1.969117E-3 * GeV, 2.018965E-3 * GeV, 2.122480E-3 * GeV, + 2.231302E-3 * GeV, 2.268877E-3 * GeV, 2.306855E-3 * GeV, + 2.345703E-3 * GeV, 2.365253E-3 * GeV, 2.385205E-3 * GeV, + 2.425130E-3 * GeV, 2.465970E-3 * GeV, 2.592403E-3 * GeV, + 2.725318E-3 * GeV, 2.865048E-3 * GeV, 3.011942E-3 * GeV, + 3.088190E-3 * GeV, 3.166368E-3 * GeV, 3.246525E-3 * GeV, + 3.328711E-3 * GeV, 3.499377E-3 * GeV, 3.678794E-3 * GeV, + 3.867410E-3 * GeV, 4.065697E-3 * GeV, 4.274149E-3 * GeV, + 4.493290E-3 * GeV, 4.607038E-3 * GeV, 4.723666E-3 * GeV, + 4.843246E-3 * GeV, 4.965853E-3 * GeV, 5.220458E-3 * GeV, + 5.488116E-3 * GeV, 5.769498E-3 * GeV, 5.915554E-3 * GeV, + 6.050000E-3 * GeV, 6.218851E-3 * GeV, 6.376282E-3 * GeV, + 6.537698E-3 * GeV, 6.592384E-3 * GeV, 6.647595E-3 * GeV, + 6.703200E-3 * GeV, 6.872893E-3 * GeV, 7.046881E-3 * GeV, + 7.225274E-3 * GeV, 7.408182E-3 * GeV, 7.595721E-3 * GeV, + 7.788008E-3 * GeV, 7.985162E-3 * GeV, 8.187308E-3 * GeV, + 8.394570E-3 * GeV, 8.607080E-3 * GeV, 8.824969E-3 * GeV, + 9.048374E-3 * GeV, 9.277435E-3 * GeV, 9.512294E-3 * GeV, + 9.753099E-3 * GeV, 1.000000E-2 * GeV, 1.025315E-2 * GeV, + 1.051271E-2 * GeV, 1.077884E-2 * GeV, 1.105171E-2 * GeV, + 1.133148E-2 * GeV, 1.161834E-2 * GeV, 1.191246E-2 * GeV, + 1.221403E-2 * GeV, 1.252323E-2 * GeV, 1.284025E-2 * GeV, + 1.316531E-2 * GeV, 1.349859E-2 * GeV, 1.384031E-2 * GeV, + 1.419068E-2 * GeV, 1.454991E-2 * GeV, 1.491825E-2 * GeV, + 1.529590E-2 * GeV, 1.568312E-2 * GeV, 1.608014E-2 * GeV, + 1.648721E-2 * GeV, 1.690459E-2 * GeV, 1.733253E-2 * GeV, + 1.777131E-2 * GeV, 1.822119E-2 * GeV, 1.868246E-2 * GeV, + 1.915541E-2 * GeV, 1.964033E-2 * GeV, 2.000000E-2 * GeV}; // G4 expects a vector // but CI doesnt like using the C++11 std std::vector bin_bounds_v; // hence this - bin_bounds_v.assign(bin_bounds, bin_bounds + 261); + bin_bounds_v.assign(bin_bounds, bin_bounds + n_bins); // create historgram - // analysisManager->CreateH1(tally_name,tally_name,10000,1e-11,100.); analysisManager->CreateH1(tally_name, tally_name, bin_bounds_v); analysisManager->CreateNtupleDColumn(tally_name); return; diff --git a/src/geant4/app/src/ExN01DetectorHit.cc b/src/geant4/app/src/ExN01DetectorHit.cc index 770612d98f..172948dd1f 100644 --- a/src/geant4/app/src/ExN01DetectorHit.cc +++ b/src/geant4/app/src/ExN01DetectorHit.cc @@ -17,12 +17,8 @@ G4ThreadLocal G4Allocator* ExN01DetectorHitAllocator = 0; ExN01DetectorHit::ExN01DetectorHit() : G4VHit(), fTrackID(-1), - //fChamberNb(-1), - //fEdep(0.), - //fPos(G4ThreeVector()), fKe(0.), fTl(0.) - //fName("") {} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -34,24 +30,16 @@ ExN01DetectorHit::~ExN01DetectorHit() {} ExN01DetectorHit::ExN01DetectorHit(const ExN01DetectorHit& right) : G4VHit() { fTrackID = right.fTrackID; - //fChamberNb = right.fChamberNb; - //fEdep = right.fEdep; - //fPos = right.fPos; fKe = right.fKe; fTl = right.fTl; - //fName = right.fName; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... const ExN01DetectorHit& ExN01DetectorHit::operator=(const ExN01DetectorHit& right) { fTrackID = right.fTrackID; - //fChamberNb = right.fChamberNb; - //fEdep = right.fEdep; - //fPos = right.fPos; fKe = right.fKe; fTl = right.fTl; - //fName = right.fName; return *this; } @@ -85,7 +73,6 @@ void ExN01DetectorHit::Draw() { void ExN01DetectorHit::Print() { G4cout << " trackID: " << fTrackID - // << std::setw(7) << G4BestUnit( fPos,"Length") << " Kinetic Energy: " << std::setw(7) << G4BestUnit(fKe, "Energy") << " Track Length: " diff --git a/src/geant4/app/src/ExN01PrimaryGeneratorAction.cc b/src/geant4/app/src/ExN01PrimaryGeneratorAction.cc index 60eb14b305..7b49d91234 100644 --- a/src/geant4/app/src/ExN01PrimaryGeneratorAction.cc +++ b/src/geant4/app/src/ExN01PrimaryGeneratorAction.cc @@ -20,16 +20,6 @@ ExN01PrimaryGeneratorAction::ExN01PrimaryGeneratorAction() : G4VUserPrimaryGeneratorAction(), fParticleGun(0) { fParticleGun = new G4GeneralParticleSource(); - /* - G4int n_particle = 1; - particleGun = new G4GeneralParticleSource(); - // particleGun = new G4ParticleGun(n_particle); - - G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable(); - G4String particleName; - particleGun->SetParticleDefinition(particleTable->FindParticle(particleName="neutron")); - // particleGun->SetParticleEnergy(14.0*MeV); - */ } ExN01PrimaryGeneratorAction::~ExN01PrimaryGeneratorAction() { @@ -38,27 +28,6 @@ ExN01PrimaryGeneratorAction::~ExN01PrimaryGeneratorAction() { void ExN01PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) { fParticleGun->GeneratePrimaryVertex(anEvent) ; - - - //G4double y = 1.0*(G4UniformRand()-0.5); - // G4double z = 1.0*(G4UniformRand()-0.5); - // particleGun->SetParticlePosition(G4ThreeVector(1.24*cm,1.24*cm,100.0*cm)); - // particleGun->SetParticlePosition(G4ThreeVector(0.*cm,0.*cm,0.*cm)); - // particleGun->SetParticleMomentumDirection(G4ThreeVector(1.0,0.0,0.0)); - - // particleGun->SetParticlePosition(G4ThreeVector(-10.0*cm,y*cm,z*cm)); - // G4int i = anEvent->GetEventID() % 3; - - /* - G4double cosTheta = 2*G4UniformRand() - 1.; - G4double phi = twopi*G4UniformRand(); - G4double sinTheta = std::sqrt(1. - cosTheta*cosTheta); - G4double ux = sinTheta*std::cos(phi), - uy = sinTheta*std::sin(phi), - uz = cosTheta; - //particleGun->SetParticleMomentumDirection(G4ThreeVector(ux,uy,uz)); - */ - } diff --git a/src/geant4/app/src/ExN01RunAction.cc b/src/geant4/app/src/ExN01RunAction.cc index 03171102bc..f5f09c1ce3 100644 --- a/src/geant4/app/src/ExN01RunAction.cc +++ b/src/geant4/app/src/ExN01RunAction.cc @@ -91,7 +91,6 @@ void ExN01RunAction::EndOfRunAction(const G4Run* run) { int index = 1 + std::distance(workflow_data->tally_library.begin(), it); // loop over this histograms - // G4cout << index << G4endl; G4cout << index << " " << analysisManager->GetH1(index)->mean() << G4endl; // scale the result by 1/volume and by (1/cm*cm) //analysisManager->ScaleH1(index,1./ double(num_of_event)); diff --git a/src/geant4/app/src/ExN01SensitiveDetector.cc b/src/geant4/app/src/ExN01SensitiveDetector.cc index 7022a9c4e8..63a44dc91f 100644 --- a/src/geant4/app/src/ExN01SensitiveDetector.cc +++ b/src/geant4/app/src/ExN01SensitiveDetector.cc @@ -120,14 +120,9 @@ void ExN01SensitiveDetector::EndOfEvent(G4HCofThisEvent*) { G4AnalysisManager* analysisManager = G4AnalysisManager::Instance(); G4int nofHits = fHitsCollection->entries(); - /* - G4cout << "Detector = " << DetectorName << G4endl; - G4cout << "\n-------->Hits Collection: in this event they are " << nofHits - << G4endl; - */ + G4double score = 0.0; -// G4cout << DetectorName << " " << nofHits << G4endl; -// G4cout << nofHits << G4endl; + for (G4int i = 0; i < nofHits; i++) { // filter on the particle type int pdg = (*fHitsCollection)[i]->GetParticlePDG(); @@ -135,8 +130,7 @@ void ExN01SensitiveDetector::EndOfEvent(G4HCofThisEvent*) { // find which histogram to put this particle in hist_index = hist_part_map[(*fHitsCollection)[i]->GetParticlePDG()]; - // G4cout << "hist index = " << hist_index << " number of hits = " << nofHits << " PDG = " << pdg << G4endl; - // if (hist_index != 0 ) { + score = (*fHitsCollection)[i]->GetWeight() * (*fHitsCollection)[i]->GetTrackLength() * cm / (DetectorVolume); @@ -144,9 +138,7 @@ void ExN01SensitiveDetector::EndOfEvent(G4HCofThisEvent*) { analysisManager->FillH1(hist_index, erg, score); - // G4cout << hist_index << " " << DetectorIndex << " " << score << " " << erg << G4endl; } - //G4cout << DetectorIndex << " " << score << G4endl; } } From 3b4ba7baba0be519df8acdef1a6f9795aa39856d Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 7 Jul 2020 12:18:18 -0500 Subject: [PATCH 3/5] remove one last commented line --- src/geant4/app/src/ExN01DetectorConstruction.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/geant4/app/src/ExN01DetectorConstruction.cc b/src/geant4/app/src/ExN01DetectorConstruction.cc index deb7337926..3dc949b6d8 100644 --- a/src/geant4/app/src/ExN01DetectorConstruction.cc +++ b/src/geant4/app/src/ExN01DetectorConstruction.cc @@ -271,7 +271,6 @@ void ExN01DetectorConstruction::ConstructSDandField() { end_histogram(); HM->print_histogram_collection(); - //exit(1); } /* initialise the histograms */ From f5af2a915f59cc5a91ee409f7c8cbf0dbed15f07 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Tue, 7 Jul 2020 12:22:49 -0500 Subject: [PATCH 4/5] adding news files --- news/PR-0691.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 news/PR-0691.rst diff --git a/news/PR-0691.rst b/news/PR-0691.rst new file mode 100644 index 0000000000..8d7e978bf3 --- /dev/null +++ b/news/PR-0691.rst @@ -0,0 +1,12 @@ +**Added:** None + +**Changed:** + - adressing comment by from PullRequest-Agent related to src/geant4 files + +**Deprecated:** None + +**Removed:** None + +**Fixed:** None + +**Security:** None From 307e5c8697546dd38ae32e815e769f65ff40e58c Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Fri, 2 Oct 2020 10:22:20 -0500 Subject: [PATCH 5/5] astyling --- .../app/src/ExN01DetectorConstruction.cc | 175 +++++++++--------- 1 file changed, 88 insertions(+), 87 deletions(-) diff --git a/src/geant4/app/src/ExN01DetectorConstruction.cc b/src/geant4/app/src/ExN01DetectorConstruction.cc index 3dc949b6d8..29e950807a 100644 --- a/src/geant4/app/src/ExN01DetectorConstruction.cc +++ b/src/geant4/app/src/ExN01DetectorConstruction.cc @@ -297,93 +297,94 @@ void ExN01DetectorConstruction::add_histogram_description(std::string tally_name */ const int n_bins = 261; G4double bin_bounds[n_bins] = { - 1.000000E-14 * GeV, 2.000000E-13 * GeV, 2.929734E-13 * GeV, - 4.291671E-13 * GeV, 6.286727E-13 * GeV, 9.209218E-13 * GeV, - 1.349028E-12 * GeV, 1.976147E-12 * GeV, 2.894792E-12 * GeV, - 4.240485E-12 * GeV, 6.211746E-12 * GeV, 9.099382E-12 * GeV, - 1.332938E-11 * GeV, 1.952578E-11 * GeV, 2.860266E-11 * GeV, - 4.189910E-11 * GeV, 6.137660E-11 * GeV, 8.990856E-11 * GeV, - 1.317041E-10 * GeV, 1.929290E-10 * GeV, 2.826153E-10 * GeV, - 4.139938E-10 * GeV, 5.315785E-10 * GeV, 6.250621E-10 * GeV, - 6.825603E-10 * GeV, 8.336811E-10 * GeV, 8.764248E-10 * GeV, - 1.125352E-9 * GeV, 1.444980E-9 * GeV, 1.855391E-9 * GeV, - 2.382370E-9 * GeV, 3.059023E-9 * GeV, 3.927864E-9 * GeV, - 5.043477E-9 * GeV, 6.475952E-9 * GeV, 8.315287E-9 * GeV, - 1.067704E-8 * GeV, 1.370959E-8 * GeV, 1.760346E-8 * GeV, - 2.260329E-8 * GeV, 2.902320E-8 * GeV, 3.726653E-8 * GeV, - 4.785117E-8 * GeV, 6.144212E-8 * GeV, 7.889325E-8 * GeV, - 1.013009E-7 * GeV, 1.300730E-7 * GeV, 1.670170E-7 * GeV, - 2.144541E-7 * GeV, 2.753645E-7 * GeV, 3.535750E-7 * GeV, - 4.539993E-7 * GeV, 5.829466E-7 * GeV, 7.485183E-7 * GeV, - 9.611165E-7 * GeV, 1.234098E-6 * GeV, 1.363889E-6 * GeV, - 1.507331E-6 * GeV, 1.584613E-6 * GeV, 1.665858E-6 * GeV, - 1.841058E-6 * GeV, 2.034684E-6 * GeV, 2.248673E-6 * GeV, - 2.485168E-6 * GeV, 2.612586E-6 * GeV, 2.746536E-6 * GeV, - 2.863488E-6 * GeV, 3.035391E-6 * GeV, 3.354626E-6 * GeV, - 3.707435E-6 * GeV, 4.097350E-6 * GeV, 4.307425E-6 * GeV, - 4.528272E-6 * GeV, 5.004514E-6 * GeV, 5.530844E-6 * GeV, - 6.267267E-6 * GeV, 7.101744E-6 * GeV, 8.047330E-6 * GeV, - 9.118820E-6 * GeV, 1.033298E-5 * GeV, 1.170880E-5 * GeV, - 1.326780E-5 * GeV, 1.503439E-5 * GeV, 1.703620E-5 * GeV, - 1.930454E-5 * GeV, 2.133482E-5 * GeV, 2.187491E-5 * GeV, - 2.357862E-5 * GeV, 2.417552E-5 * GeV, 2.478752E-5 * GeV, - 2.605841E-5 * GeV, 2.808794E-5 * GeV, 3.182781E-5 * GeV, - 3.430669E-5 * GeV, 3.517517E-5 * GeV, 3.606563E-5 * GeV, - 4.086771E-5 * GeV, 4.630919E-5 * GeV, 5.247518E-5 * GeV, - 5.656217E-5 * GeV, 5.946217E-5 * GeV, 6.251086E-5 * GeV, - 6.737947E-5 * GeV, 7.635094E-5 * GeV, 8.651695E-5 * GeV, - 9.803655E-5 * GeV, 1.110900E-4 * GeV, 1.167857E-4 * GeV, - 1.227734E-4 * GeV, 1.290681E-4 * GeV, 1.356856E-4 * GeV, - 1.426423E-4 * GeV, 1.499558E-4 * GeV, 1.576442E-4 * GeV, - 1.616349E-4 * GeV, 1.657268E-4 * GeV, 1.699221E-4 * GeV, - 1.742237E-4 * GeV, 1.831564E-4 * GeV, 1.925470E-4 * GeV, - 2.024191E-4 * GeV, 2.127974E-4 * GeV, 2.237077E-4 * GeV, - 2.351775E-4 * GeV, 2.472353E-4 * GeV, 2.599113E-4 * GeV, - 2.732372E-4 * GeV, 2.801543E-4 * GeV, 2.872464E-4 * GeV, - 2.945181E-4 * GeV, 3.019738E-4 * GeV, 3.096183E-4 * GeV, - 3.174564E-4 * GeV, 3.337327E-4 * GeV, 3.508435E-4 * GeV, - 3.688317E-4 * GeV, 3.877421E-4 * GeV, 4.076220E-4 * GeV, - 4.285213E-4 * GeV, 4.504920E-4 * GeV, 4.735892E-4 * GeV, - 4.978707E-4 * GeV, 5.104743E-4 * GeV, 5.233971E-4 * GeV, - 5.366469E-4 * GeV, 5.502322E-4 * GeV, 5.784432E-4 * GeV, - 6.081006E-4 * GeV, 6.392786E-4 * GeV, 6.720551E-4 * GeV, - 7.065121E-4 * GeV, 7.427358E-4 * GeV, 7.808167E-4 * GeV, - 8.208500E-4 * GeV, 8.629359E-4 * GeV, 9.071795E-4 * GeV, - 9.536916E-4 * GeV, 9.616402E-4 * GeV, 9.778344E-4 * GeV, - 1.002588E-3 * GeV, 1.053992E-3 * GeV, 1.108032E-3 * GeV, - 1.164842E-3 * GeV, 1.194330E-3 * GeV, 1.224564E-3 * GeV, - 1.287349E-3 * GeV, 1.353353E-3 * GeV, 1.422741E-3 * GeV, - 1.495686E-3 * GeV, 1.533550E-3 * GeV, 1.572372E-3 * GeV, - 1.612176E-3 * GeV, 1.652989E-3 * GeV, 1.737739E-3 * GeV, - 1.826835E-3 * GeV, 1.873082E-3 * GeV, 1.920499E-3 * GeV, - 1.969117E-3 * GeV, 2.018965E-3 * GeV, 2.122480E-3 * GeV, - 2.231302E-3 * GeV, 2.268877E-3 * GeV, 2.306855E-3 * GeV, - 2.345703E-3 * GeV, 2.365253E-3 * GeV, 2.385205E-3 * GeV, - 2.425130E-3 * GeV, 2.465970E-3 * GeV, 2.592403E-3 * GeV, - 2.725318E-3 * GeV, 2.865048E-3 * GeV, 3.011942E-3 * GeV, - 3.088190E-3 * GeV, 3.166368E-3 * GeV, 3.246525E-3 * GeV, - 3.328711E-3 * GeV, 3.499377E-3 * GeV, 3.678794E-3 * GeV, - 3.867410E-3 * GeV, 4.065697E-3 * GeV, 4.274149E-3 * GeV, - 4.493290E-3 * GeV, 4.607038E-3 * GeV, 4.723666E-3 * GeV, - 4.843246E-3 * GeV, 4.965853E-3 * GeV, 5.220458E-3 * GeV, - 5.488116E-3 * GeV, 5.769498E-3 * GeV, 5.915554E-3 * GeV, - 6.050000E-3 * GeV, 6.218851E-3 * GeV, 6.376282E-3 * GeV, - 6.537698E-3 * GeV, 6.592384E-3 * GeV, 6.647595E-3 * GeV, - 6.703200E-3 * GeV, 6.872893E-3 * GeV, 7.046881E-3 * GeV, - 7.225274E-3 * GeV, 7.408182E-3 * GeV, 7.595721E-3 * GeV, - 7.788008E-3 * GeV, 7.985162E-3 * GeV, 8.187308E-3 * GeV, - 8.394570E-3 * GeV, 8.607080E-3 * GeV, 8.824969E-3 * GeV, - 9.048374E-3 * GeV, 9.277435E-3 * GeV, 9.512294E-3 * GeV, - 9.753099E-3 * GeV, 1.000000E-2 * GeV, 1.025315E-2 * GeV, - 1.051271E-2 * GeV, 1.077884E-2 * GeV, 1.105171E-2 * GeV, - 1.133148E-2 * GeV, 1.161834E-2 * GeV, 1.191246E-2 * GeV, - 1.221403E-2 * GeV, 1.252323E-2 * GeV, 1.284025E-2 * GeV, - 1.316531E-2 * GeV, 1.349859E-2 * GeV, 1.384031E-2 * GeV, - 1.419068E-2 * GeV, 1.454991E-2 * GeV, 1.491825E-2 * GeV, - 1.529590E-2 * GeV, 1.568312E-2 * GeV, 1.608014E-2 * GeV, - 1.648721E-2 * GeV, 1.690459E-2 * GeV, 1.733253E-2 * GeV, - 1.777131E-2 * GeV, 1.822119E-2 * GeV, 1.868246E-2 * GeV, - 1.915541E-2 * GeV, 1.964033E-2 * GeV, 2.000000E-2 * GeV}; + 1.000000E-14 * GeV, 2.000000E-13 * GeV, 2.929734E-13 * GeV, + 4.291671E-13 * GeV, 6.286727E-13 * GeV, 9.209218E-13 * GeV, + 1.349028E-12 * GeV, 1.976147E-12 * GeV, 2.894792E-12 * GeV, + 4.240485E-12 * GeV, 6.211746E-12 * GeV, 9.099382E-12 * GeV, + 1.332938E-11 * GeV, 1.952578E-11 * GeV, 2.860266E-11 * GeV, + 4.189910E-11 * GeV, 6.137660E-11 * GeV, 8.990856E-11 * GeV, + 1.317041E-10 * GeV, 1.929290E-10 * GeV, 2.826153E-10 * GeV, + 4.139938E-10 * GeV, 5.315785E-10 * GeV, 6.250621E-10 * GeV, + 6.825603E-10 * GeV, 8.336811E-10 * GeV, 8.764248E-10 * GeV, + 1.125352E-9 * GeV, 1.444980E-9 * GeV, 1.855391E-9 * GeV, + 2.382370E-9 * GeV, 3.059023E-9 * GeV, 3.927864E-9 * GeV, + 5.043477E-9 * GeV, 6.475952E-9 * GeV, 8.315287E-9 * GeV, + 1.067704E-8 * GeV, 1.370959E-8 * GeV, 1.760346E-8 * GeV, + 2.260329E-8 * GeV, 2.902320E-8 * GeV, 3.726653E-8 * GeV, + 4.785117E-8 * GeV, 6.144212E-8 * GeV, 7.889325E-8 * GeV, + 1.013009E-7 * GeV, 1.300730E-7 * GeV, 1.670170E-7 * GeV, + 2.144541E-7 * GeV, 2.753645E-7 * GeV, 3.535750E-7 * GeV, + 4.539993E-7 * GeV, 5.829466E-7 * GeV, 7.485183E-7 * GeV, + 9.611165E-7 * GeV, 1.234098E-6 * GeV, 1.363889E-6 * GeV, + 1.507331E-6 * GeV, 1.584613E-6 * GeV, 1.665858E-6 * GeV, + 1.841058E-6 * GeV, 2.034684E-6 * GeV, 2.248673E-6 * GeV, + 2.485168E-6 * GeV, 2.612586E-6 * GeV, 2.746536E-6 * GeV, + 2.863488E-6 * GeV, 3.035391E-6 * GeV, 3.354626E-6 * GeV, + 3.707435E-6 * GeV, 4.097350E-6 * GeV, 4.307425E-6 * GeV, + 4.528272E-6 * GeV, 5.004514E-6 * GeV, 5.530844E-6 * GeV, + 6.267267E-6 * GeV, 7.101744E-6 * GeV, 8.047330E-6 * GeV, + 9.118820E-6 * GeV, 1.033298E-5 * GeV, 1.170880E-5 * GeV, + 1.326780E-5 * GeV, 1.503439E-5 * GeV, 1.703620E-5 * GeV, + 1.930454E-5 * GeV, 2.133482E-5 * GeV, 2.187491E-5 * GeV, + 2.357862E-5 * GeV, 2.417552E-5 * GeV, 2.478752E-5 * GeV, + 2.605841E-5 * GeV, 2.808794E-5 * GeV, 3.182781E-5 * GeV, + 3.430669E-5 * GeV, 3.517517E-5 * GeV, 3.606563E-5 * GeV, + 4.086771E-5 * GeV, 4.630919E-5 * GeV, 5.247518E-5 * GeV, + 5.656217E-5 * GeV, 5.946217E-5 * GeV, 6.251086E-5 * GeV, + 6.737947E-5 * GeV, 7.635094E-5 * GeV, 8.651695E-5 * GeV, + 9.803655E-5 * GeV, 1.110900E-4 * GeV, 1.167857E-4 * GeV, + 1.227734E-4 * GeV, 1.290681E-4 * GeV, 1.356856E-4 * GeV, + 1.426423E-4 * GeV, 1.499558E-4 * GeV, 1.576442E-4 * GeV, + 1.616349E-4 * GeV, 1.657268E-4 * GeV, 1.699221E-4 * GeV, + 1.742237E-4 * GeV, 1.831564E-4 * GeV, 1.925470E-4 * GeV, + 2.024191E-4 * GeV, 2.127974E-4 * GeV, 2.237077E-4 * GeV, + 2.351775E-4 * GeV, 2.472353E-4 * GeV, 2.599113E-4 * GeV, + 2.732372E-4 * GeV, 2.801543E-4 * GeV, 2.872464E-4 * GeV, + 2.945181E-4 * GeV, 3.019738E-4 * GeV, 3.096183E-4 * GeV, + 3.174564E-4 * GeV, 3.337327E-4 * GeV, 3.508435E-4 * GeV, + 3.688317E-4 * GeV, 3.877421E-4 * GeV, 4.076220E-4 * GeV, + 4.285213E-4 * GeV, 4.504920E-4 * GeV, 4.735892E-4 * GeV, + 4.978707E-4 * GeV, 5.104743E-4 * GeV, 5.233971E-4 * GeV, + 5.366469E-4 * GeV, 5.502322E-4 * GeV, 5.784432E-4 * GeV, + 6.081006E-4 * GeV, 6.392786E-4 * GeV, 6.720551E-4 * GeV, + 7.065121E-4 * GeV, 7.427358E-4 * GeV, 7.808167E-4 * GeV, + 8.208500E-4 * GeV, 8.629359E-4 * GeV, 9.071795E-4 * GeV, + 9.536916E-4 * GeV, 9.616402E-4 * GeV, 9.778344E-4 * GeV, + 1.002588E-3 * GeV, 1.053992E-3 * GeV, 1.108032E-3 * GeV, + 1.164842E-3 * GeV, 1.194330E-3 * GeV, 1.224564E-3 * GeV, + 1.287349E-3 * GeV, 1.353353E-3 * GeV, 1.422741E-3 * GeV, + 1.495686E-3 * GeV, 1.533550E-3 * GeV, 1.572372E-3 * GeV, + 1.612176E-3 * GeV, 1.652989E-3 * GeV, 1.737739E-3 * GeV, + 1.826835E-3 * GeV, 1.873082E-3 * GeV, 1.920499E-3 * GeV, + 1.969117E-3 * GeV, 2.018965E-3 * GeV, 2.122480E-3 * GeV, + 2.231302E-3 * GeV, 2.268877E-3 * GeV, 2.306855E-3 * GeV, + 2.345703E-3 * GeV, 2.365253E-3 * GeV, 2.385205E-3 * GeV, + 2.425130E-3 * GeV, 2.465970E-3 * GeV, 2.592403E-3 * GeV, + 2.725318E-3 * GeV, 2.865048E-3 * GeV, 3.011942E-3 * GeV, + 3.088190E-3 * GeV, 3.166368E-3 * GeV, 3.246525E-3 * GeV, + 3.328711E-3 * GeV, 3.499377E-3 * GeV, 3.678794E-3 * GeV, + 3.867410E-3 * GeV, 4.065697E-3 * GeV, 4.274149E-3 * GeV, + 4.493290E-3 * GeV, 4.607038E-3 * GeV, 4.723666E-3 * GeV, + 4.843246E-3 * GeV, 4.965853E-3 * GeV, 5.220458E-3 * GeV, + 5.488116E-3 * GeV, 5.769498E-3 * GeV, 5.915554E-3 * GeV, + 6.050000E-3 * GeV, 6.218851E-3 * GeV, 6.376282E-3 * GeV, + 6.537698E-3 * GeV, 6.592384E-3 * GeV, 6.647595E-3 * GeV, + 6.703200E-3 * GeV, 6.872893E-3 * GeV, 7.046881E-3 * GeV, + 7.225274E-3 * GeV, 7.408182E-3 * GeV, 7.595721E-3 * GeV, + 7.788008E-3 * GeV, 7.985162E-3 * GeV, 8.187308E-3 * GeV, + 8.394570E-3 * GeV, 8.607080E-3 * GeV, 8.824969E-3 * GeV, + 9.048374E-3 * GeV, 9.277435E-3 * GeV, 9.512294E-3 * GeV, + 9.753099E-3 * GeV, 1.000000E-2 * GeV, 1.025315E-2 * GeV, + 1.051271E-2 * GeV, 1.077884E-2 * GeV, 1.105171E-2 * GeV, + 1.133148E-2 * GeV, 1.161834E-2 * GeV, 1.191246E-2 * GeV, + 1.221403E-2 * GeV, 1.252323E-2 * GeV, 1.284025E-2 * GeV, + 1.316531E-2 * GeV, 1.349859E-2 * GeV, 1.384031E-2 * GeV, + 1.419068E-2 * GeV, 1.454991E-2 * GeV, 1.491825E-2 * GeV, + 1.529590E-2 * GeV, 1.568312E-2 * GeV, 1.608014E-2 * GeV, + 1.648721E-2 * GeV, 1.690459E-2 * GeV, 1.733253E-2 * GeV, + 1.777131E-2 * GeV, 1.822119E-2 * GeV, 1.868246E-2 * GeV, + 1.915541E-2 * GeV, 1.964033E-2 * GeV, 2.000000E-2 * GeV + }; // G4 expects a vector // but CI doesnt like using the C++11 std