Changeset 139 for MEMPHYS

Timestamp:

Apr 6, 2006, 8:19:55 PM (18 years ago)

Author:

campagne

Message:

JEC switch to Track Id and Energy deposit vectors

File:

• MEMPHYS/HEAD/MEMPHYS/WCHit.hh (modified) (5 diffs)

MEMPHYS/HEAD/MEMPHYS/WCHit.hh

@@ -41 +41 @@
   
   void SetTubeID       (G4int tube)                 { tubeID = tube; }
-  void SetTrackID      (G4int track)                { trackID = track; }
-  void SetEdep         (G4double de)                { edep = de; }
-  //  void SetPos          (G4ThreeVector xyz)          { pos = xyz; }
-  // void SetRot          (G4RotationMatrix rotMatrix) { rot = rotMatrix; }
+  //JEC 6/4/06  void SetTrackID      (G4int track)                { trackID = track; }
+  //JEC 6/4/06  void SetEdep         (G4double de)                { edep = de; }
   void SetTransform (G4Transform3D aTrans) { transform = aTrans; }
   void SetLogicalVolume(G4LogicalVolume* logV)      { pLogV = logV;}
@@ -53 +51 @@
   void SetMaxPe(G4int number = 0)  {maxPe   = number;}
 
-  void AddPe(G4float hitTime);  
+  void AddPe(G4float hitTime);
+  void AddTrk(G4int trackID);                //JEC 6/4/06
+  void AddEdep(G4double energyDeposition);   //JEC 6/4/06 
 
   G4int         GetTubeID()     { return tubeID; }
-  G4int         GetTrackID()    { return trackID; }
-  //G4ThreeVector GetPos()        { return pos; }
+  //obsolete G4int         GetTrackID()    { return trackID; }
   G4int         GetTotalPe()    { return totalPe;}
-  G4float       GetTime(int i)  { return time[i]; }
+  G4float       GetTime(G4int i)  { return time[i]; }
+  G4int         GetTrack(G4int i) {return trkId[i];}
+  
   G4Transform3D GetTransform()  { return transform; }
   G4LogicalVolume* GetLogicalVolume() { return pLogV; }
@@ -74 +75 @@
   
   G4int            tubeID;
-  G4int            trackID;
-  G4double         edep;
-  //G4ThreeVector    pos;
-  //G4RotationMatrix rot;
+  //JEC 6/4/06 G4int            trackID;
+  //JEC 6/4/06 G4double         edep;
 
   //JEC to GB
@@ -83 +82 @@
   G4Transform3D    transform;
   G4LogicalVolume* pLogV;
+  G4int                 totalPe;
+  std::vector<G4float>    time;
+  std::vector<G4int>    trkId;   //JEC 6/4/06
+  std::vector<G4double> edep; //JEC 6/4/06
+  
+  //for digitization
+  G4int                 totalPeInGate;
 
   // This is temporarily used for the drawing scale
@@ -88 +94 @@
   static G4int     maxPe;
 
-  G4int                 totalPe;
-  std::vector<G4float>  time;
-  G4int                 totalPeInGate;
 };
 }