Changeset 68
- Timestamp:
- Jan 10, 2006, 4:28:08 PM (19 years ago)
- Location:
- MEMPHYS/HEAD
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
MEMPHYS/HEAD/MEMPHYS/MEMPHYSAnalysis.hh
r10 r68 10 10 } 11 11 12 #define CAST(aObject,aClass) (aClass*)(aObject)->cast(#aClass) 13 12 //JEC 10/1/06 introduction 13 namespace MEMPHYS { 14 14 15 15 class MEMPHYSAnalysis : public virtual MEMPHYSIAnalysis { … … 29 29 }; 30 30 31 31 } 32 32 #endif -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSDetectorConstruction.hh
r10 r68 15 15 #include <hash_map.h> 16 16 17 enum cyl_location {endcap1,wall,endcap2}; //JEC FIXME Not in Global18 17 19 18 class G4Box; … … 24 23 class G4VPhysicalVolume; 25 24 26 class MEMPHYSAnalysis; 27 class MEMPHYSDetectorMessenger; 28 class MEMPHYSWCSD; 25 29 26 30 27 //JEC FIXME does it runs on over plateform? 28 // look in /usr/include/c++/3.2.3/ext/ 31 29 namespace __gnu_cxx { 32 30 template<> struct hash< std::string > … … 38 36 } 39 37 40 //JEC 18/11/05 introduce AIDA41 38 namespace AIDA { 42 39 class ITuple; 43 40 } 41 42 43 //JEC 10/1/06 introduce MEMPHYS 44 namespace MEMPHYS { 45 44 46 class MEMPHYSAnalysis; 47 class MEMPHYSDetectorMessenger; 48 class MEMPHYSWCSD; 49 class MEMPHYSAnalysis; 50 51 enum cyl_location {endcap1,wall,endcap2}; 52 45 53 46 54 class MEMPHYSDetectorConstruction : public G4VUserDetectorConstruction { … … 243 251 }; 244 252 253 } 254 255 245 256 #endif 246 257 -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSDetectorMessenger.hh
r10 r68 2 2 #define MEMPHYSDetectorMessenger_h 1 3 3 4 class MEMPHYSDetectorConstruction;5 class G4UIdirectory;6 class G4UIcmdWithAString;7 4 8 5 #include "G4UImessenger.hh" … … 12 9 #include "G4UIdirectory.hh" 13 10 #include "G4UIcmdWithADouble.hh" 11 12 13 class G4UIdirectory; 14 class G4UIcmdWithAString; 15 16 //JEC 10/1/06 introduce MEMPHYS 17 namespace MEMPHYS { 18 19 class MEMPHYSDetectorConstruction; 20 14 21 15 22 class MEMPHYSDetectorMessenger: public G4UImessenger { … … 30 37 }; 31 38 39 } 32 40 #endif 33 41 -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSEventAction.hh
r10 r68 20 20 class ITuple; 21 21 } 22 22 //JEC 10/1/06 introduce MEMPHYS 23 namespace MEMPHYS { 23 24 24 25 class MEMPHYSAnalysis; … … 56 57 }; 57 58 59 } 58 60 59 61 #endif -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSIAnalysis.hh
r10 r68 2 2 #define MEMPHYS_IAnalysis_h 3 3 4 //JEC 10/1/06 introduce MEMPHYS 5 namespace MEMPHYS { 4 6 5 7 class MEMPHYSIAnalysis { … … 10 12 }; 11 13 14 } 12 15 13 16 #endif -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSPhysicsList.hh
r10 r68 8 8 //MEMPHYS 9 9 #include "MEMPHYS/MEMPHYSPhysicsMessenger.hh" 10 11 //JEC 10/1/06 introduce MEMPHYS 12 namespace MEMPHYS { 13 10 14 11 15 class MEMPHYSPhysicsList: public G4VUserPhysicsList { … … 51 55 }; 52 56 57 } 53 58 #endif 54 59 -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSPhysicsMessenger.hh
r10 r68 5 5 #include "G4UImessenger.hh" 6 6 7 class MEMPHYSPhysicsList;8 7 class G4UIdirectory; 9 8 class G4UIcommand; 10 9 class G4UIcmdWithAString; 10 //JEC 10/1/06 introduce MEMPHYS 11 namespace MEMPHYS { 12 13 class MEMPHYSPhysicsList; 11 14 12 15 class MEMPHYSPhysicsMessenger: public G4UImessenger … … 26 29 }; 27 30 31 } 28 32 #endif -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSPrimaryGeneratorAction.hh
r10 r68 2 2 #define MEMPHYSPrimaryGeneratorAction_h 3 3 4 //Geant4 4 5 #include "G4VUserPrimaryGeneratorAction.hh" 5 6 #include "G4ThreeVector.hh" 6 7 #include "globals.hh" 7 8 9 //std 8 10 #include <fstream> 9 11 10 12 class G4ParticleGun; 11 13 class G4Event; 14 15 //JEC 10/1/06 introduce MEMPHYS 16 namespace MEMPHYS { 12 17 13 18 class MEMPHYSDetectorConstruction; … … 94 99 } 95 100 G4bool IsGeneratingVertexInRock() { return GenerateVertexInRock; } 96 void SetGenerateVertexInRock(G4bool choice) { GenerateVertexInRock = choice; 101 void SetGenerateVertexInRock(G4bool choice) { GenerateVertexInRock = choice;} 97 102 }; 103 104 105 } 98 106 99 107 #endif -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSPrimaryGeneratorMessenger.hh
r10 r68 2 2 #define MEMPHYSPrimaryGeneratorMessenger_h 1 3 3 4 //Geant4 5 #include "G4UImessenger.hh" 6 #include "globals.hh" 7 4 8 class G4UIdirectory; 5 9 class G4UIcmdWithAString; 10 11 12 //JEC 10/1/06 introduce MEMPHYS 13 namespace MEMPHYS { 14 6 15 class MEMPHYSPrimaryGeneratorAction; 7 16 8 9 #include "G4UImessenger.hh"10 #include "globals.hh"11 17 12 18 class MEMPHYSPrimaryGeneratorMessenger: public G4UImessenger { … … 28 34 29 35 }; 30 36 } 31 37 #endif 32 38 -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSRunAction.hh
r10 r68 8 8 9 9 class G4Run; 10 11 //JEC 10/1/06 introduce MEMPHYS 12 namespace MEMPHYS { 10 13 class MEMPHYSRunActionMessenger; 11 14 … … 34 37 MEMPHYSRunActionMessenger* messenger; 35 38 }; 36 39 } 37 40 #endif -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSRunActionMessenger.hh
r10 r68 2 2 #define MEMPHYSRunActionMessenger_h 1 3 3 4 class MEMPHYSRunAction; 4 //Geant4 5 #include "G4UImessenger.hh" 6 #include "globals.hh" 7 5 8 class G4UIdirectory; 6 9 class G4UIcmdWithAString; 7 10 8 #include "G4UImessenger.hh" 9 #include "globals.hh" 11 12 //JEC 10/1/06 introduce MEMPHYS 13 namespace MEMPHYS { 14 class MEMPHYSRunAction; 10 15 11 16 class MEMPHYSRunActionMessenger: public G4UImessenger { … … 23 28 G4UIdirectory* MEMPHYSIODir; 24 29 }; 25 30 } 26 31 #endif 27 32 -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSStackingAction.hh
r10 r68 2 2 #define MEMPHYSStackingAction_H 1 3 3 4 //Geant4 4 5 #include "globals.hh" 5 6 #include "G4UserStackingAction.hh" … … 7 8 class G4Track; 8 9 10 //JEC 10/1/06 introduce MEMPHYS 11 namespace MEMPHYS { 9 12 class MEMPHYSStackingAction : public G4UserStackingAction { 10 13 … … 18 21 virtual void PrepareNewEvent(); 19 22 }; 20 23 } 21 24 #endif 22 25 -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSSteppingAction.hh
r65 r68 6 6 #include "G4UserSteppingAction.hh" 7 7 8 //JEC 14/12/05 code adapted from G4 extanded optical LXe ex. 8 //JEC 10/1/06 introduce MEMPHYS 9 namespace MEMPHYS { 9 10 10 11 class MEMPHYSSteppingAction : public G4UserSteppingAction … … 22 23 // G4bool oneStepPrimaries; 23 24 }; 24 25 } 25 26 #endif -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSTrackInformation.hh
r65 r68 11 11 //for Track Status 12 12 13 14 //JEC 10/1/06 introduce MEMPHYS 15 namespace MEMPHYS { 16 13 17 enum TrackStatus { active=1, hitPMT=2, absorbed=4, boundaryAbsorbed=8, 14 18 inactive=14}; 15 19 16 20 /*TrackStatus: … … 63 67 64 68 }; 69 } 65 70 66 extern G4Allocator<MEMPHYSTrackInformation> aMEMPHYSTrackInfoAllocator; 71 //JEC 10/1/06 introduce MEMPHYS 72 namespace MEMPHYS { 73 extern G4Allocator<MEMPHYSTrackInformation> aMEMPHYSTrackInfoAllocator; 74 } 67 75 68 inline void* MEMPHYS TrackInformation::operator new(size_t) {76 inline void* MEMPHYS::MEMPHYSTrackInformation::operator new(size_t) { 69 77 void* aTrackInfo; 70 aTrackInfo = (void*) aMEMPHYSTrackInfoAllocator.MallocSingle();78 aTrackInfo = (void*)MEMPHYS::aMEMPHYSTrackInfoAllocator.MallocSingle(); 71 79 return aTrackInfo; 72 80 } 73 81 74 inline void MEMPHYS TrackInformation::operator delete(void *aTrackInfo){75 aMEMPHYSTrackInfoAllocator.FreeSingle((MEMPHYSTrackInformation*)aTrackInfo);82 inline void MEMPHYS::MEMPHYSTrackInformation::operator delete(void *aTrackInfo){ 83 MEMPHYS::aMEMPHYSTrackInfoAllocator.FreeSingle((MEMPHYS::MEMPHYSTrackInformation*)aTrackInfo); 76 84 } 77 85 -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSTrackingAction.hh
r10 r68 6 6 #include "globals.hh" 7 7 8 //std 8 9 #include <set> 9 10 10 11 11 12 class G4Track; 13 14 //JEC 10/1/06 introduce MEMPHYS 15 namespace MEMPHYS { 12 16 13 17 class MEMPHYSTrackingAction : public G4UserTrackingAction { … … 27 31 G4float thresholdTobeSaved; 28 32 }; 29 33 } 30 34 31 35 #endif -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSTrajectory.hh
r10 r68 21 21 22 22 typedef std::vector<G4VTrajectoryPoint*> TrajectoryPointContainer; 23 24 //JEC 10/1/06 introduce MEMPHYS 25 namespace MEMPHYS { 26 23 27 24 28 class MEMPHYSTrajectory : public G4VTrajectory { … … 98 102 G4double globalTime; 99 103 }; 104 } 100 105 101 /*** TEMP : M FECHNER *********** 102 ** modification by Chris Walter that works for geant4 >= 4.6.2p01 103 ** does not compile with 4.6.1 104 #if defined G4TRACKING_ALLOC_EXPORT 105 extern G4DLLEXPORT G4Allocator<MEMPHYSTrajectory> myTrajectoryAllocator; 106 #else 107 extern G4DLLIMPORT G4Allocator<MEMPHYSTrajectory> myTrajectoryAllocator; 108 #endif 109 */ 106 //JEC 10/1/06 introduce MEMPHYS 107 namespace MEMPHYS { 108 extern G4Allocator<MEMPHYSTrajectory> myTrajectoryAllocator; 109 } 110 110 111 extern G4Allocator<MEMPHYSTrajectory> myTrajectoryAllocator; 112 113 inline void* MEMPHYSTrajectory::operator new(size_t) 111 inline void* MEMPHYS::MEMPHYSTrajectory::operator new(size_t) 114 112 { 115 113 void* aTrajectory; 116 aTrajectory = (void*) myTrajectoryAllocator.MallocSingle();114 aTrajectory = (void*)MEMPHYS::myTrajectoryAllocator.MallocSingle(); 117 115 return aTrajectory; 118 116 } 119 117 120 inline void MEMPHYS Trajectory::operator delete(void* aTrajectory)118 inline void MEMPHYS::MEMPHYSTrajectory::operator delete(void* aTrajectory) 121 119 { 122 myTrajectoryAllocator.FreeSingle((MEMPHYSTrajectory*)aTrajectory);120 MEMPHYS::myTrajectoryAllocator.FreeSingle((MEMPHYS::MEMPHYSTrajectory*)aTrajectory); 123 121 } 124 122 -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSWCDigi.hh
r45 r68 14 14 15 15 16 //JEC 10/1/06 introduce MEMPHYS 17 namespace MEMPHYS { 16 18 17 19 class MEMPHYSWCDigi : public G4VDigi { … … 65 67 66 68 }; 67 69 } 68 70 //----------------------------------------------------------------------- 69 71 70 typedef G4TDigiCollection<MEMPHYSWCDigi> MEMPHYSWCDigitsCollection; 71 extern G4Allocator<MEMPHYSWCDigi> MEMPHYSWCDigiAllocator; 72 //JEC 10/1/06 introduce MEMPHYS 73 namespace MEMPHYS { 72 74 73 inline void* MEMPHYSWCDigi::operator new(size_t) { 75 typedef G4TDigiCollection<MEMPHYSWCDigi> MEMPHYSWCDigitsCollection; 76 extern G4Allocator<MEMPHYSWCDigi> MEMPHYSWCDigiAllocator; 77 } 78 79 inline void* MEMPHYS::MEMPHYSWCDigi::operator new(size_t) { 74 80 void* aDigi; 75 aDigi = (void*) MEMPHYS WCDigiAllocator.MallocSingle();81 aDigi = (void*) MEMPHYS::MEMPHYSWCDigiAllocator.MallocSingle(); 76 82 return aDigi; 77 83 } 78 84 79 inline void MEMPHYS WCDigi::operator delete(void* aDigi) {80 MEMPHYS WCDigiAllocator.FreeSingle((MEMPHYSWCDigi*) aDigi);85 inline void MEMPHYS::MEMPHYSWCDigi::operator delete(void* aDigi) { 86 MEMPHYS::MEMPHYSWCDigiAllocator.FreeSingle((MEMPHYS::MEMPHYSWCDigi*) aDigi); 81 87 } 82 88 -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSWCDigitizer.hh
r10 r68 10 10 #include "MEMPHYS/MEMPHYSWCDigi.hh" 11 11 12 //JEC 10/1/06 introduce MEMPHYS 13 namespace MEMPHYS { 12 14 13 15 class MEMPHYSWCDigitizer : public G4VDigitizerModule { … … 65 67 }; 66 68 69 } 67 70 #endif 68 71 -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSWCHit.hh
r45 r68 16 16 #include <algorithm> // for sort, find, count_if 17 17 #include <functional> //for less_equal, bind2nd,... 18 19 //JEC 10/1/06 introduce MEMPHYS 20 namespace MEMPHYS { 18 21 19 22 class MEMPHYSWCHit : public G4VHit { … … 67 70 68 71 private: 69 70 //JEC 17/11/05 put the Copy Ctor and the Assignation Operator private71 72 MEMPHYSWCHit(const MEMPHYSWCHit&); 72 73 const MEMPHYSWCHit& operator=(const MEMPHYSWCHit&); … … 91 92 G4int totalPeInGate; 92 93 }; 94 } 93 95 94 96 //---------------------------------------------------------------- 95 97 96 typedef G4THitsCollection<MEMPHYSWCHit> MEMPHYSWCHitsCollection; 98 //JEC 10/1/06 introduce MEMPHYS 99 namespace MEMPHYS { 100 typedef G4THitsCollection<MEMPHYSWCHit> MEMPHYSWCHitsCollection; 101 extern G4Allocator<MEMPHYSWCHit> MEMPHYSWCHitAllocator; 102 } 97 103 98 extern G4Allocator<MEMPHYSWCHit> MEMPHYSWCHitAllocator; 99 100 inline void* MEMPHYSWCHit::operator new(size_t) { 104 inline void* MEMPHYS::MEMPHYSWCHit::operator new(size_t) { 101 105 void *aHit; 102 aHit = (void *) MEMPHYS WCHitAllocator.MallocSingle();106 aHit = (void *) MEMPHYS::MEMPHYSWCHitAllocator.MallocSingle(); 103 107 return aHit; 104 108 } 105 109 106 inline void MEMPHYS WCHit::operator delete(void *aHit) {107 MEMPHYS WCHitAllocator.FreeSingle((MEMPHYSWCHit*) aHit);110 inline void MEMPHYS::MEMPHYSWCHit::operator delete(void *aHit) { 111 MEMPHYS::MEMPHYSWCHitAllocator.FreeSingle((MEMPHYS::MEMPHYSWCHit*) aHit); 108 112 } 109 113 -
MEMPHYS/HEAD/MEMPHYS/MEMPHYSWCSD.hh
r65 r68 10 10 class G4Step; 11 11 class G4HCofThisEvent; 12 13 //JEC 10/1/06 introduce MEMPHYS 14 namespace MEMPHYS { 12 15 13 16 class MEMPHYSWCSD : public G4VSensitiveDetector { … … 25 28 MEMPHYSWCHitsCollection* hitsCollection; 26 29 std::map<int,int> PMTHitMap; // Whether a PMT was hit already 27 G4int HCID; //JEC 16/11/0530 G4int HCID; 28 31 29 32 }; 30 33 34 } 31 35 #endif 32 36 -
MEMPHYS/HEAD/applications/MEMPHYS_batch.cxx
r65 r68 40 40 } 41 41 //Book all the histo, tuple 42 MEMPHYS Analysis* analysis = newMEMPHYSAnalysis(*aida);42 MEMPHYS::MEMPHYSAnalysis* analysis = new MEMPHYS::MEMPHYSAnalysis(*aida); 43 43 44 44 … … 51 51 52 52 //JEC 18/11/05 give the "analysis" to fill geometry ITuple 53 MEMPHYS DetectorConstruction* MEMPHYSdetector =54 new MEMPHYS DetectorConstruction(*analysis);53 MEMPHYS::MEMPHYSDetectorConstruction* MEMPHYSdetector = 54 new MEMPHYS::MEMPHYSDetectorConstruction(*analysis); 55 55 56 56 runManager->SetUserInitialization(MEMPHYSdetector); 57 57 58 runManager->SetUserInitialization(new MEMPHYS PhysicsList);58 runManager->SetUserInitialization(new MEMPHYS::MEMPHYSPhysicsList); 59 59 60 60 G4UImanager* UI = G4UImanager::GetUIpointer(); … … 68 68 69 69 // Set user action classes 70 MEMPHYS PrimaryGeneratorAction* myGeneratorAction = newMEMPHYSPrimaryGeneratorAction(MEMPHYSdetector);70 MEMPHYS::MEMPHYSPrimaryGeneratorAction* myGeneratorAction = new MEMPHYS::MEMPHYSPrimaryGeneratorAction(MEMPHYSdetector); 71 71 runManager->SetUserAction(myGeneratorAction); 72 72 73 MEMPHYS RunAction* myRunAction = newMEMPHYSRunAction();73 MEMPHYS::MEMPHYSRunAction* myRunAction = new MEMPHYS::MEMPHYSRunAction(); 74 74 75 75 runManager->SetUserAction(myRunAction); 76 76 77 77 78 runManager->SetUserAction(new MEMPHYS EventAction(*analysis,78 runManager->SetUserAction(new MEMPHYS::MEMPHYSEventAction(*analysis, 79 79 myRunAction, 80 80 MEMPHYSdetector, 81 81 myGeneratorAction)); 82 runManager->SetUserAction(new MEMPHYS TrackingAction);82 runManager->SetUserAction(new MEMPHYS::MEMPHYSTrackingAction); 83 83 84 runManager->SetUserAction(new MEMPHYS StackingAction);85 runManager->SetUserAction(new MEMPHYS SteppingAction); //JEC 15/12/05 Add user SteppingAction84 runManager->SetUserAction(new MEMPHYS::MEMPHYSStackingAction); 85 runManager->SetUserAction(new MEMPHYS::MEMPHYSSteppingAction); //JEC 15/12/05 Add user SteppingAction 86 86 87 87 // Initialize G4 kernel -
MEMPHYS/HEAD/applications/MEMPHYS_session.cxx
r65 r68 37 37 // Create a manager to access the MEMPHYSAnalysis from the callbacks : 38 38 39 //JEC 10/1/06 introduce MEMPHYS namespace 40 namespace MEMPHYS { 39 41 class MEMPHYSAnalysisManager 40 42 :public virtual IManager … … 43 45 virtual const std::string& name() const { return fName;} 44 46 virtual void* cast(const std::string& aTo) const { 45 if(aTo=="MEMPHYS AnalysisManager") {46 return Lib_SCast(MEMPHYS AnalysisManager);47 } else if(aTo=="MEMPHYS IAnalysis") {48 return Lib_SCast(MEMPHYS IAnalysis);49 } else if(aTo=="MEMPHYS Analysis") {50 return Lib_SCast(MEMPHYS Analysis);47 if(aTo=="MEMPHYS::MEMPHYSAnalysisManager") { 48 return Lib_SCast(MEMPHYS::MEMPHYSAnalysisManager); 49 } else if(aTo=="MEMPHYS::MEMPHYSIAnalysis") { 50 return Lib_SCast(MEMPHYS::MEMPHYSIAnalysis); 51 } else if(aTo=="MEMPHYS::MEMPHYSAnalysis") { 52 return Lib_SCast(MEMPHYS::MEMPHYSAnalysis); 51 53 } else if(aTo=="IManager") { 52 54 return Lib_SCast(IManager); … … 57 59 public: 58 60 MEMPHYSAnalysisManager(AIDA::IAnalysisFactory& aAIDA,bool aBatch) 59 :MEMPHYSAnalysis(aAIDA,aBatch),fName("MEMPHYS AnalysisManager") {}61 :MEMPHYSAnalysis(aAIDA,aBatch),fName("MEMPHYS::MEMPHYSAnalysisManager") {} 60 62 virtual ~MEMPHYSAnalysisManager(){} 61 63 private: 62 64 std::string fName; 63 65 }; 64 66 } 65 67 66 68 ////////////////////////////////////////////////////////////////////////////// … … 80 82 G4Lab::UIOnX* session = new G4Lab::UIOnX(*runManager,gui,aArgc,aArgv); 81 83 82 MEMPHYS AnalysisManager* analysisManager = 0;84 MEMPHYS::MEMPHYSAnalysisManager* analysisManager = 0; 83 85 84 86 AIDA::IAnalysisFactory* aida = G4Lab::UIOnX_aida(*session); … … 86 88 std::cout << "MEMPHYS_session : AIDA not found." << std::endl; 87 89 } else { 88 analysisManager = new MEMPHYS AnalysisManager(*aida,false);90 analysisManager = new MEMPHYS::MEMPHYSAnalysisManager(*aida,false); 89 91 session->addManager(analysisManager); 90 92 } … … 94 96 //FIXME : From G4VDigiCollection, we can't loop on G4VDigi ! 95 97 session->addType 96 (new G4Lab::DigitsCollectionType<MEMPHYS WCDigi>98 (new G4Lab::DigitsCollectionType<MEMPHYS::MEMPHYSWCDigi> 97 99 (*(session->session()),"WCDigitizedCollection")); 98 100 } … … 107 109 108 110 //JEC 18/11/05 give the "analysis" to fill geometry ITuple 109 MEMPHYS DetectorConstruction* MEMPHYSdetector =110 new MEMPHYS DetectorConstruction(*analysisManager);111 MEMPHYS::MEMPHYSDetectorConstruction* MEMPHYSdetector = 112 new MEMPHYS::MEMPHYSDetectorConstruction(*analysisManager); 111 113 112 114 runManager->SetUserInitialization(MEMPHYSdetector); 113 115 114 runManager->SetUserInitialization(new MEMPHYS PhysicsList);116 runManager->SetUserInitialization(new MEMPHYS::MEMPHYSPhysicsList); 115 117 116 118 // Set user action classes 117 MEMPHYS PrimaryGeneratorAction* myGeneratorAction =118 new MEMPHYS PrimaryGeneratorAction(MEMPHYSdetector);119 MEMPHYS::MEMPHYSPrimaryGeneratorAction* myGeneratorAction = 120 new MEMPHYS::MEMPHYSPrimaryGeneratorAction(MEMPHYSdetector); 119 121 runManager->SetUserAction(myGeneratorAction); 120 122 121 MEMPHYS RunAction* myRunAction = newMEMPHYSRunAction();123 MEMPHYS::MEMPHYSRunAction* myRunAction = new MEMPHYS::MEMPHYSRunAction(); 122 124 123 125 runManager->SetUserAction(myRunAction); 124 126 125 127 126 runManager->SetUserAction(new MEMPHYS EventAction(*analysisManager,128 runManager->SetUserAction(new MEMPHYS::MEMPHYSEventAction(*analysisManager, 127 129 myRunAction, 128 130 MEMPHYSdetector, 129 131 myGeneratorAction)); 130 runManager->SetUserAction(new MEMPHYS TrackingAction);132 runManager->SetUserAction(new MEMPHYS::MEMPHYSTrackingAction); 131 133 132 runManager->SetUserAction(new MEMPHYS StackingAction);134 runManager->SetUserAction(new MEMPHYS::MEMPHYSStackingAction); 133 135 134 runManager->SetUserAction(new MEMPHYS SteppingAction); //JEC 15/12/05 Add user SteppingAction136 runManager->SetUserAction(new MEMPHYS::MEMPHYSSteppingAction); //JEC 15/12/05 Add user SteppingAction 135 137 136 138 // Initialize G4 kernel
Note: See TracChangeset
for help on using the changeset viewer.