Changeset 104 for MEMPHYS

Timestamp:

Jan 25, 2006, 11:46:28 AM (18 years ago)

Author:

campagne

Message:

remove static variables/functions (JEC)

Location:

MEMPHYS/HEAD/MEMPHYS

Files:

• DetectorConstruction.hh (modified) (5 diffs)
• WCSD.hh (modified) (2 diffs)

MEMPHYS/HEAD/MEMPHYS/DetectorConstruction.hh

@@ -40 +40 @@
 }
 
-
-//JEC 10/1/06 introduce MEMPHYS
 namespace MEMPHYS {
 
@@ -49 +47 @@
 class Analysis; 
 
-enum cyl_location {endcap1,wall,endcap2};
+
+enum cyl_location {endcap1,wall,endcap2}; //geographical position of the PMTs
 
 
@@ -63 +62 @@
   void Set20inchPMTGeometry(); //JEC is obsolete according to M.F but code is still valid(?)
   void Set8inchPMTGeometry();
+  //  void Set12inchPMTGoemetry(); //JEC 25/1/06
   void SetRockGeometry();
   void UpdateGeometry();
@@ -73 +73 @@
 
   // Related to the WC tube IDs
-  static G4int GetTubeID(std::string tubeTag){return tubeLocationMap[tubeTag];}
-  static G4Transform3D GetTubeTransform(int tubeNo){return tubeIDMap[tubeNo];}
+  //JEC 25/1/06 no more static functions
+  G4int GetTubeID(std::string tubeTag){return tubeLocationMap[tubeTag];}
+  G4Transform3D GetTubeTransform(int tubeNo){return tubeIDMap[tubeNo];}
 
 private:
@@ -172 +173 @@
 
   // Tube map information
-  static std::map<int, G4Transform3D> tubeIDMap;
-  static std::map<int, cyl_location> tubeCylLocation;
   //JEC FIXME: why it works wo using std::hash_map and std::hash?
-  static hash_map<std::string, int, hash<std::string> >  tubeLocationMap;
+  //JEC 25/1/06 no more static variables
+  std::map<int, G4Transform3D> tubeIDMap;
+  std::map<int, cyl_location> tubeCylLocation;
+  hash_map<std::string, int, hash<std::string> >  tubeLocationMap;
 
   // Variable related to the rock

MEMPHYS/HEAD/MEMPHYS/WCSD.hh

@@ -11 +11 @@
 class G4HCofThisEvent;
 
-//JEC 10/1/06 introduce MEMPHYS
 namespace MEMPHYS {
+
+class DetectorConstruction; //JEC 25/1/06
+
 
 class WCSD : public G4VSensitiveDetector {
  public:
-  WCSD(G4String);
+  WCSD(G4String, DetectorConstruction*); //JEC 25/1/06
   virtual ~WCSD();
   
@@ -30 +32 @@
   G4int HCID;
 
+  
+  DetectorConstruction* MEMPHYSDetConstruction; //JEC 25/1/06
+
 };