Merge pull request #83 from JeffersonLab/new_dirc_functionality_rtj

New dirc functionality rtj

GNUmakefile

@@ -46,6 +46,9 @@ CPPFLAGS += -DG4MULTITHREADED
 #CPPFLAGS += -DDEBUG_SECTIONPLANE
 #CPPFLAGS += -DDEBUG_SECTIONPLANE_ZAVE
 #CPPFLAGS += -DG4VERSION_10_04_OR_LATER=1
+ifneq (, $(wildcard $(HALLD_RECON_HOME)/src/libraries/DIRC/DDIRCPmtHit.*))
+	CPPFLAGS += -DDIRCTRUTHEXTRA
+endif
 
 # If you want to build against Geant4.10.03 or greater, you will need this line uncommented
 #CPPFLAGS += -DG4VUSERPHYSICSLIST_HAS_GETPARTICLEITERATOR

src/GlueXDetectorConstruction.cc

@@ -368,13 +368,29 @@ void GlueXDetectorConstruction::ConstructSDandField()
          }
          iter->second->SetSensitiveDetector(ftofHandler);
       }
-      else if (volname == "QZBL" || volname == "PIXV") {
+      // radiator volume: BNNM (NN = bar number 0-47 and M is sub-bar character A-D)
+      else if (volname == "PIXV" || 
+               (volname(0,1)(0) == 'B' && 
+                10*((int)volname(1,1)(0)-48)+(int)volname(2,1)(0)-48 >= 0 &&
+                10*((int)volname(1,1)(0)-48)+(int)volname(2,1)(0)-48 < 48))
+      {  // this is nasty, but it works
          if (dircHandler == 0) {
             dircHandler = new GlueXSensitiveDetectorDIRC("dirc");
             SDman->AddNewDetector(dircHandler);
          }
          iter->second->SetSensitiveDetector(dircHandler);
       }
+      else if (volname == "FWM1" || volname == "FWM2" || volname == "FTMR" ||
+               volname == "TSM1" || volname == "TSM2" || volname == "TSM3" ||
+               volname == "FSM1" || volname == "FSM2" || volname == "OWDG" ||
+               (volname(0,1)(0) == 'A' && volname(0,1)(1) == 'G') )
+      {
+         if (dircHandler == 0) {
+           dircHandler = new GlueXSensitiveDetectorDIRC("dirc");
+           SDman->AddNewDetector(dircHandler);
+         }
+         iter->second->SetSensitiveDetector(dircHandler);
+      }
       else if (volname == "CERW" || volname == "CPPC") {
          if (cereHandler == 0) {
             cereHandler = new GlueXSensitiveDetectorCERE("cere");

src/GlueXHitDIRCPmt.cc

@@ -13,11 +13,15 @@ GlueXHitDIRCPmt::GlueXHitDIRCPmt(const GlueXHitDIRCPmt &src)
 {
   E_GeV = src.E_GeV;
   t_ns = src.t_ns;
+  t_fixed_ns = src.t_fixed_ns;
   x_cm = src.x_cm;
   y_cm = src.y_cm;
   z_cm = src.z_cm;
   ch = src.ch;
   key_bar = src.key_bar;
+  path = src.path;
+  refl = src.refl;
+  bbrefl = src.bbrefl;
 }
 
 void GlueXHitDIRCPmt::Draw() const
@@ -29,9 +33,13 @@ void GlueXHitDIRCPmt::Print() const
 {
   G4cout << "   E = " << E_GeV << " GeV" << G4endl
 	 << "   t = " << t_ns << " ns" << G4endl
+	 << "   t_fixed = " << t_fixed_ns << " ns" << G4endl
 	 << "   x = " << x_cm << " cm" << G4endl
 	 << "   y = " << y_cm << " cm" << G4endl
 	 << "   z = " << z_cm << " cm" << G4endl
+	 << "   path = " << path << " " << G4endl
+	 << "   refl = " << refl << " " << G4endl
+	 << "   bbrefl = " << bbrefl << " " << G4endl
 	 << "   ch = " << ch << " " << G4endl
 	 << "   key_bar = " << key_bar << " " << G4endl
 	 << G4endl;

src/GlueXHitDIRCPmt.hh

@@ -25,11 +25,16 @@ public:
 
   G4double E_GeV;      // photon energy [GeV]
   G4double t_ns;       // detection time [ns]
+  G4double t_fixed_ns; // fixed pathlength time [ns]
   G4double x_cm;       // x coordinate where hit was created
   G4double y_cm;       // y coordinate where hit was created
   G4double z_cm;       // z coordinate where hit was created
+  int64_t  path;       // photon's path id in the optical box
+  G4int    refl;       // number of reflections in the oprical box
+  G4bool   bbrefl;     // reflected off far end mirror of bar box
   G4int    ch;         // PMT channel of the hit
   G4int    key_bar;    // key of the corresponding bar hit
+  G4int    track;      // index of the MC track
 };
 
 typedef G4THitsMap<GlueXHitDIRCPmt> GlueXHitsMapDIRCPmt;

src/GlueXHitDIRCWob.cc

@@ -0,0 +1,26 @@
+//
+// GlueXHitDIRCWob - class implementation
+//
+// created on: 05.04.2017
+// original author: r.dzhygadlo at gsi.de
+
+#include "GlueXHitDIRCWob.hh"
+
+G4ThreadLocal G4Allocator<GlueXHitDIRCWob>* GlueXHitDIRCWobAllocator = 0;
+
+GlueXHitDIRCWob::GlueXHitDIRCWob():G4VHit()
+{
+}
+
+void GlueXHitDIRCWob::Draw() const
+{
+   // not yet implemented
+}
+
+void GlueXHitDIRCWob::Print() const
+{
+   G4cout << "GlueXHitDIRCWob:" << G4endl
+          << "   track = " << track << G4endl
+          << "   normalId = " << normalId << " " << G4endl
+          << G4endl;
+}

src/GlueXHitDIRCWob.hh

@@ -0,0 +1,45 @@
+//
+// GlueXHitDIRCWob - class implementation
+//
+// created on: 05.04.2017
+// original author: r.dzhygadlo at gsi.de
+
+#ifndef GlueXHitDIRCWob_h
+#define GlueXHitDIRCWob_h 1
+
+#include "G4VHit.hh"
+#include "G4THitsMap.hh"
+#include "G4Allocator.hh"
+
+class GlueXHitDIRCWob : public G4VHit
+{
+public:
+  GlueXHitDIRCWob();
+
+  void *operator new(size_t);
+  void operator delete(void *aHit);
+
+  void Draw() const;
+  void Print() const;
+
+  G4double normalId;   // uniq identifier of the normal
+  G4int track;         // index of the MC track 
+};
+
+typedef G4THitsMap<GlueXHitDIRCWob> GlueXHitsMapDIRCWob;
+
+extern G4ThreadLocal G4Allocator<GlueXHitDIRCWob>* GlueXHitDIRCWobAllocator;
+
+inline void* GlueXHitDIRCWob::operator new(size_t)
+{
+  if (!GlueXHitDIRCWobAllocator)
+    GlueXHitDIRCWobAllocator = new G4Allocator<GlueXHitDIRCWob>;
+  return (void *) GlueXHitDIRCWobAllocator->MallocSingle();
+}
+
+inline void GlueXHitDIRCWob::operator delete(void *aHit)
+{
+  GlueXHitDIRCWobAllocator->FreeSingle((GlueXHitDIRCWob*) aHit);
+}
+
+#endif