Changeset 65 for MEMPHYS/HEAD

Timestamp:

Jan 9, 2006, 4:59:11 PM (18 years ago)

Author:

campagne

Message:

o SteppingAction

• JEC 15/12/05 version adapted from LXe exmple

o DetectorConstruction

• JEC 15/12/05 OpGlassCathodeSurface properties as in the LXe example

use dielectric_metal with Reflectivity=0 and Efficiency=100%

o Trajectory

• JEC 15/12/05 remove the SaveIt management

o TrackingAction

• JEC 14/12/05 PreUserTrackingAction

create and store a priori a Trajectory
set save and draw option according to some criteria

PostUserTrackingAction

keep the Trajectory if a PMT has been hit overwise kill
it

o TrackInformation

• JEC 15/12/05 use LXe example as basis

use TrackStatus:

active: still being tracked
hitPMT: stopped by being detected in a PMT
absorbed: stopped by being absorbed with G4OpAbsorbtion
boundaryAbsorbed: stopped by being aborbed with G4OpAbsorbtion
hitSphere: track hit the sphere at some point
inactive: track is stopped for some reason

This is the sum of all stopped flags so
can be used to remove stopped flags

saveit=false, drawit=false, status=active (default)
introduce status bits

o WCSD

-JEC 15/12/05 use ProcessHits_constStep(const G4Step*, G4TouchableHistory*)

to proceed with "const G4Step*"

o batch

• JEC 15/12/06 register SteppingAction

o session

• JEC 15/12/06 register SteppingAction

Location:

MEMPHYS/HEAD

Files:

• MEMPHYS/MEMPHYSSteppingAction.hh (added)
• MEMPHYS/MEMPHYSTrackInformation.hh (modified) (2 diffs)
• MEMPHYS/MEMPHYSWCSD.hh (modified) (1 diff)
• applications/MEMPHYS_batch.cxx (modified) (2 diffs)
• applications/MEMPHYS_session.cxx (modified) (2 diffs)

MEMPHYS/HEAD/MEMPHYS/MEMPHYSTrackInformation.hh

@@ -8 +8 @@
 #include "G4VUserTrackInformation.hh"
 
-// Maximilien Fechner, december 2004
-// Information class for flagging the secondaries
-// I'm interested in (namely gammas from pi0s and secondaries
-// from muon decay
+//JEC 14/12/05: use code from G4 extended optical LXe example
+//for Track Status
+
+enum TrackStatus { active=1, hitPMT=2, absorbed=4, boundaryAbsorbed=8,
+                      inactive=14};
+
+/*TrackStatus:
+  active: still being tracked
+  hitPMT: stopped by being detected in a PMT
+  absorbed: stopped by being absorbed with G4OpAbsorbtion
+  boundaryAbsorbed: stopped by being aborbed with G4OpAbsorbtion
+  hitSphere: track hit the sphere at some point
+  inactive: track is stopped for some reason
+   -This is the sum of all stopped flags so can be used to remove stopped flags
+  
+ */
+
 class MEMPHYSTrackInformation : public G4VUserTrackInformation {
-private:
-  G4bool saveit; 
 
 public:
-  MEMPHYSTrackInformation() : saveit(true) {}
-  MEMPHYSTrackInformation(const MEMPHYSTrackInformation* aninfo) 
-  { saveit = aninfo->saveit;}
+  MEMPHYSTrackInformation(): saveit(false), drawit(false), status(active) {}
+  //  MEMPHYSTrackInformation(const MEMPHYSTrackInformation* aninfo) 
+  // { saveit = aninfo->saveit;}
+  MEMPHYSTrackInformation(const G4Track*);
   virtual ~MEMPHYSTrackInformation() {}
-  MEMPHYSTrackInformation(const G4Track* );
   
   inline void *operator new(size_t);
@@ -28 +39 @@
   {return (this==&right);}
 
+  
+  //Sets the track status to s (does not check validity of flags)
+  void SetTrackStatusFlags(G4int s){status=s;}
+  //Does a smart add of track status flags (disabling old flags that conflict)
+  //If s conflicts with itself it will not be detected
+  void AddTrackStatusFlag(G4int s);
+  int GetTrackStatus()  {return status;}
+
+  void SetDrawOption(G4bool b) {drawit = b;}
+  G4bool GetDrawOption() {return drawit;}
+
+  void SetSaveOption(G4bool b) {saveit = b;}
+  G4bool GetSaveOption() {return saveit;}
+
+
   void Print() const;
+
+
+private:
+  G4bool saveit; 
+  G4bool drawit;
+  G4int  status; 
 
 };

MEMPHYS/HEAD/MEMPHYS/MEMPHYSWCSD.hh

@@ -18 +18 @@
   void   Initialize(G4HCofThisEvent*);
   G4bool ProcessHits(G4Step*, G4TouchableHistory*);
+  G4bool ProcessHits_constStep(const G4Step*, G4TouchableHistory*);
   void   EndOfEvent(G4HCofThisEvent*);
   

MEMPHYS/HEAD/applications/MEMPHYS_batch.cxx

@@ -14 +14 @@
 #include "MEMPHYS/MEMPHYSStackingAction.hh"
 #include "MEMPHYS/MEMPHYSTrackingAction.hh"
+#include "MEMPHYS/MEMPHYSSteppingAction.hh"
 
 
@@ -82 +83 @@
 
   runManager->SetUserAction(new MEMPHYSStackingAction);
-
+  runManager->SetUserAction(new MEMPHYSSteppingAction); //JEC 15/12/05 Add user SteppingAction
 
   // Initialize G4 kernel

MEMPHYS/HEAD/applications/MEMPHYS_session.cxx

@@ -32 +32 @@
 #include "MEMPHYS/MEMPHYSStackingAction.hh"
 #include "MEMPHYS/MEMPHYSTrackingAction.hh"
+#include "MEMPHYS/MEMPHYSSteppingAction.hh"
 #include "MEMPHYS/MEMPHYSWCDigi.hh"
 
@@ -131 +132 @@
   runManager->SetUserAction(new MEMPHYSStackingAction);
 
+  runManager->SetUserAction(new MEMPHYSSteppingAction); //JEC 15/12/05 Add user SteppingAction
 
   // Initialize G4 kernel