Merge pull request #126 from JeffersonLab/tof_upgrade_fixes_rtj

Tof upgrade fixes rtj
JeffersonLab · Oct 13, 2019 · 1fe8c0d · 1fe8c0d
2 parents 8567429 + 9f99d8e
commit 1fe8c0d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/GlueXDetectorConstruction.cc b/src/GlueXDetectorConstruction.cc
@@ -361,7 +361,9 @@ void GlueXDetectorConstruction::ConstructSDandField()
          }
          iter->second->SetSensitiveDetector(ccalHandler);
       }
-      else if (volname == "FTOC" || volname == "FTOX" || volname == "FTOH") {
+      else if (volname == "FTOC" || volname == "FTOX" || 
+               volname == "FTOH" || volname == "FTOL")
+      {
          if (ftofHandler == 0) {
             ftofHandler = new GlueXSensitiveDetectorFTOF("ftof");
             SDman->AddNewDetector(ftofHandler);

diff --git a/src/GlueXSensitiveDetectorFTOF.cc b/src/GlueXSensitiveDetectorFTOF.cc
@@ -154,7 +154,13 @@ G4bool GlueXSensitiveDetectorFTOF::ProcessHits(G4Step* step,
    int plane = GetIdent("plane", touch);
    int column = GetIdent("column", touch);
    int barNo = GetIdent("row", touch);
-   barNo = (barNo > 44)? barNo - 23 : barNo;
+   int barIndex = (column < 2)? barNo : GetIdent("paired_row", touch);
+   if (barIndex < 1) {
+      G4cerr << "GlueXSensitiveDetectorFTOF::ProcessHits error - "
+             << "hdds geometry for FTOF is missing paired_row identifier, "
+             << "cannot continue!" << G4endl;
+      exit(1);
+   }
    G4Track *track = step->GetTrack();
    G4int trackID = track->GetTrackID();
    int pdgtype = track->GetDynamicParticle()->GetPDGcode();
@@ -191,10 +197,10 @@ G4bool GlueXSensitiveDetectorFTOF::ProcessHits(G4Step* step,
    // Post the hit to the hits map, ordered by plane,bar,end index
 
    if (dEsum > 0) {
-      int key = GlueXHitFTOFbar::GetKey(plane, barNo);
+      int key = GlueXHitFTOFbar::GetKey(plane, barIndex);
       GlueXHitFTOFbar *counter = (*fBarHitsMap)[key];
       if (counter == 0) {
-         GlueXHitFTOFbar newcounter(plane, barNo);
+         GlueXHitFTOFbar newcounter(plane, barIndex);
          fBarHitsMap->add(key, newcounter);
          counter = (*fBarHitsMap)[key];
       }

diff --git a/src/hdgeant4.cc b/src/hdgeant4.cc
@@ -23,6 +23,7 @@
 #include <G4UImanager.hh>
 #include <G4Timer.hh>
 #include <G4LogicalVolumeStore.hh>
+#include <G4HadronicProcessStore.hh>
 
 #ifdef G4VIS_USE
 #include <G4VisExecutive.hh>
@@ -151,7 +152,7 @@ int main(int argc,char** argv)
 #else
    G4RunManager runManager;
 #endif
-   runManager.SetVerboseLevel(3);
+   runManager.SetVerboseLevel(0);
 
    // Let user turn off geometry optimization for faster startup
    // (and slower running)
@@ -184,6 +185,8 @@ int main(int argc,char** argv)
    // Physics process initialization
    GlueXPhysicsList *physicslist = new GlueXPhysicsList();
    runManager.SetUserInitialization(physicslist);
+   G4HadronicProcessStore *pstore = G4HadronicProcessStore::Instance();
+   pstore->SetVerbose(0);
 
    // User actions initialization
    GlueXUserActionInitialization *userinit;