Changeset 104
- Timestamp:
- Jan 25, 2006, 11:46:28 AM (19 years ago)
- Location:
- MEMPHYS/HEAD/MEMPHYS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
MEMPHYS/HEAD/MEMPHYS/DetectorConstruction.hh
r70 r104 40 40 } 41 41 42 43 //JEC 10/1/06 introduce MEMPHYS44 42 namespace MEMPHYS { 45 43 … … 49 47 class Analysis; 50 48 51 enum cyl_location {endcap1,wall,endcap2}; 49 50 enum cyl_location {endcap1,wall,endcap2}; //geographical position of the PMTs 52 51 53 52 … … 63 62 void Set20inchPMTGeometry(); //JEC is obsolete according to M.F but code is still valid(?) 64 63 void Set8inchPMTGeometry(); 64 // void Set12inchPMTGoemetry(); //JEC 25/1/06 65 65 void SetRockGeometry(); 66 66 void UpdateGeometry(); … … 73 73 74 74 // Related to the WC tube IDs 75 static G4int GetTubeID(std::string tubeTag){return tubeLocationMap[tubeTag];} 76 static G4Transform3D GetTubeTransform(int tubeNo){return tubeIDMap[tubeNo];} 75 //JEC 25/1/06 no more static functions 76 G4int GetTubeID(std::string tubeTag){return tubeLocationMap[tubeTag];} 77 G4Transform3D GetTubeTransform(int tubeNo){return tubeIDMap[tubeNo];} 77 78 78 79 private: … … 172 173 173 174 // Tube map information 174 static std::map<int, G4Transform3D> tubeIDMap;175 static std::map<int, cyl_location> tubeCylLocation;176 175 //JEC FIXME: why it works wo using std::hash_map and std::hash? 177 static hash_map<std::string, int, hash<std::string> > tubeLocationMap; 176 //JEC 25/1/06 no more static variables 177 std::map<int, G4Transform3D> tubeIDMap; 178 std::map<int, cyl_location> tubeCylLocation; 179 hash_map<std::string, int, hash<std::string> > tubeLocationMap; 178 180 179 181 // Variable related to the rock -
MEMPHYS/HEAD/MEMPHYS/WCSD.hh
r70 r104 11 11 class G4HCofThisEvent; 12 12 13 //JEC 10/1/06 introduce MEMPHYS14 13 namespace MEMPHYS { 14 15 class DetectorConstruction; //JEC 25/1/06 16 15 17 16 18 class WCSD : public G4VSensitiveDetector { 17 19 public: 18 WCSD(G4String );20 WCSD(G4String, DetectorConstruction*); //JEC 25/1/06 19 21 virtual ~WCSD(); 20 22 … … 30 32 G4int HCID; 31 33 34 35 DetectorConstruction* MEMPHYSDetConstruction; //JEC 25/1/06 36 32 37 }; 33 38
Note: See TracChangeset
for help on using the changeset viewer.