Merge pull request JeffersonLab#73 from dglazier/master

actually fix rich bug this time, need to set _detector_id_order to 0 …
dglazier · Jul 22, 2024 · 90c771b · 90c771b
2 parents 2df25ae + 079974e
commit 90c771b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Clas12Banks/particle_detector.h b/Clas12Banks/particle_detector.h
@@ -70,8 +70,8 @@ namespace clas12 {
     ////////////////////////////////////////////////////////////////
     //override header notify, called at start of event
     void notify() override {
-      bank::notify();
       if(_detector_id_order==-1) return;
+      bank::notify();
       scanIndex();
     }
 

diff --git a/Clas12Banks/rich.cpp b/Clas12Banks/rich.cpp
@@ -14,7 +14,9 @@ namespace clas12 {
     clas12::particle_detector(aschema),
     _ring{new richring(ringschema)}
   {
-
+    // std::cout<<"DEBUG "<<"rich::rich()"<< std::endl;
+    //aschema.show();
+    _detector_id_order=0; //dont have a detector bank, but getDetector is fixed
    _id_order   = aschema.getEntryOrder("id");
    _hindex_order   = aschema.getEntryOrder("hindex");
    _pindex_order   = aschema.getEntryOrder("pindex");
@@ -40,10 +42,11 @@ namespace clas12 {
   }
   rich::rich(hipo::schema aschema):
     clas12::particle_detector(aschema)  {
-
+
+    _detector_id_order=0; //dont have a detector bank, but getDetector is fixed
     _id_order   = aschema.getEntryOrder("id");
-   _hindex_order   = aschema.getEntryOrder("hindex");
-   _pindex_order   = aschema.getEntryOrder("pindex");
+    _hindex_order   = aschema.getEntryOrder("hindex");
+    _pindex_order   = aschema.getEntryOrder("pindex");
    _emilay_order   = aschema.getEntryOrder("emilay");
    _emico_order   = aschema.getEntryOrder("emico");
    _enico_order   = aschema.getEntryOrder("enico");

diff --git a/Clas12Banks/rich.h b/Clas12Banks/rich.h
@@ -89,7 +89,7 @@ namespace clas12 {
       return 0;
     }
 
-
+ 
   private:
 
     friend clas12::rich;
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,7 @@ namespace clas12 { @@
           return 0;
         }
       private:
         friend clas12::rich;
@@ Expand Down @@