Merge pull request #56 from dglazier/master

db runnumbers
JeffersonLab · Aug 7, 2023 · c0b106a · c0b106a
2 parents f356265 + 0f32dee
commit c0b106a
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 31 deletions.
diff --git a/Clas12Banks/clas12databases.cpp b/Clas12Banks/clas12databases.cpp
@@ -94,6 +94,9 @@ namespace clas12 {
 }
   //update run number to each database
   void clas12databases::notifyRun(int runNb){
+    //check if already set up for this run
+    if( _runNb=runNb) return;
+
     _runNb=runNb;
 
     open();

diff --git a/Clas12Banks/clas12reader.cpp b/Clas12Banks/clas12reader.cpp
@@ -684,11 +684,12 @@ namespace clas12 {
     _db=db;
 
     _connectDB=true;
-
-    _runNo=readQuickRunConfig(_filename);
 
-    if(_verbose )std::cout<<"Connecting databases to run "<<_runNo<<std::endl;
-    if(_runNo!=0)_db->notifyRun(_runNo);
+    auto runNumber =readQuickRunConfig(_filename);
+
+    if(_verbose )std::cout<<"Connecting databases to run "<<runNumber<<std::endl;
+    //Do not need to notify if run number has not changed
+    if(_runNo!=0)_db->notifyRun(runNumber);
   }
   /////////////////////////////////////////////////////////
   ///make a list of banks, required for writer

diff --git a/Clas12Banks/clas12reader.h b/Clas12Banks/clas12reader.h
@@ -97,19 +97,19 @@ namespace clas12 {
      void addARegionCDet(){
       //Forward detector needs particles, calorimeter, scintillator,
       //track, cherenkov
-       region_cdet_uptr  reg{new region_cdet{_bparts.get(),_bftbparts.get(),_bcovmat.get(),_bcal.get(),_bscint.get(),_btrck.get(),_butrck.get(),_btraj.get(),_bcher.get(),_bft.get(),_bevent.get(),_bmcparts.get()}};
+       region_cdet_uptr  reg{new region_cdet{_bparts.get(),_bftbparts.get(),_bcovmat.get(),_bcal.get(),_bscint.get(),_btrck.get(),_butrck.get(),_btraj.get(),_bcher.get(),_bft.get(),_bevent.get(),_brich.get(),_bmcparts.get()}};
       if(_useFTBased)reg->useFTBPid();
       _rcdets.push_back(std::move(reg));
     }
     void addARegionFT(){
       //Forward tagger needs particles and forward tagger
-       region_ft_uptr  reg{new region_ft{_bparts.get(),_bftbparts.get(),_bcovmat.get(),_bcal.get(),_bscint.get(),_btrck.get(),_butrck.get(),_btraj.get(),_bcher.get(),_bft.get(),_bevent.get(),_bmcparts.get()}};
+       region_ft_uptr  reg{new region_ft{_bparts.get(),_bftbparts.get(),_bcovmat.get(),_bcal.get(),_bscint.get(),_btrck.get(),_butrck.get(),_btraj.get(),_bcher.get(),_bft.get(),_bevent.get(),_brich.get(),_bmcparts.get()}};
        if(_useFTBased)reg->useFTBPid();
       _rfts.push_back(std::move(reg));
      }
   void addARegionBAND(){
       //Forward tagger needs particles and forward tagger
-       region_band_uptr  reg{new region_band{_bparts.get(),_bftbparts.get(),_bcovmat.get(),_bcal.get(),_bscint.get(),_btrck.get(),_butrck.get(),_btraj.get(),_bcher.get(),_bft.get(),_bevent.get(),_bmcparts.get()}};
+       region_band_uptr  reg{new region_band{_bparts.get(),_bftbparts.get(),_bcovmat.get(),_bcal.get(),_bscint.get(),_btrck.get(),_butrck.get(),_btraj.get(),_bcher.get(),_bft.get(),_bevent.get(),_brich.get(),_bmcparts.get()}};
        if(_useFTBased)reg->useFTBPid();
       _rbands.push_back(std::move(reg));
      }

diff --git a/Clas12Banks/region_band.cpp b/Clas12Banks/region_band.cpp
@@ -12,8 +12,8 @@ namespace clas12 {
   ///////////////////////////////////////////////////////
   ///Constructor used for event,
   ///give all detector banks to prevent crashes when looking for FD
-  region_band::region_band(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp, scint_ptr scp, trck_ptr trp, utrck_ptr utrp, traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,mcpar_ptr mcp):
-    region_particle(pars,ftbpars,cm,calp,scp,trp,utrp,trj,chp,ftp,event,mcp)
+  region_band::region_band(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp, scint_ptr scp, trck_ptr trp, utrck_ptr utrp, traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,rich_ptr rich,mcpar_ptr mcp):
+    region_particle(pars,ftbpars,cm,calp,scp,trp,utrp,trj,chp,ftp,event,rich,mcp)
   {
     _region=clas12::BD;
   }

diff --git a/Clas12Banks/region_band.h b/Clas12Banks/region_band.h
@@ -28,7 +28,7 @@ namespace clas12 {
      region_band(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm,
 		 cal_ptr calp, scint_ptr scp,trck_ptr trp,utrck_ptr utrp,
 		 traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,
-		 mcpar_ptr mcp=nullptr);
+		 rich_ptr rich,mcpar_ptr mcp=nullptr);
     ~region_band() final=default;
 
 

diff --git a/Clas12Banks/region_cdet.cpp b/Clas12Banks/region_cdet.cpp
@@ -18,8 +18,8 @@ namespace clas12 {
   ///////////////////////////////////////////////////////
   ///Constructor used for event,
   ///give all detector banks to prevent crashes when looking for FT 
-  region_cdet::region_cdet(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp, scint_ptr scp, trck_ptr trp,utrck_ptr utrp, traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,mcpar_ptr mcp):
-    region_particle(pars,ftbpars,cm,calp,scp,trp,utrp,trj,chp,ftp,event,mcp)
+  region_cdet::region_cdet(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp, scint_ptr scp, trck_ptr trp,utrck_ptr utrp, traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,rich_ptr rich,mcpar_ptr mcp):
+    region_particle(pars,ftbpars,cm,calp,scp,trp,utrp,trj,chp,ftp,event,rich,mcp)
   {
     _region=clas12::CD;
   }

diff --git a/Clas12Banks/region_cdet.h b/Clas12Banks/region_cdet.h
@@ -30,7 +30,7 @@ namespace clas12 {
     // 		trck_ptr trp,traj_ptr trj);
     region_cdet(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp, scint_ptr scp,
 		trck_ptr trp,utrck_ptr utrp, traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,
-		mcpar_ptr mcp=nullptr);
+		rich_ptr rich,mcpar_ptr mcp=nullptr);
     ~region_cdet() final=default;
 
 

diff --git a/Clas12Banks/region_fdet.cpp b/Clas12Banks/region_fdet.cpp
@@ -10,14 +10,9 @@ namespace clas12 {
    ///////////////////////////////////////////////////////
   ///Constructor used for event,
   ///give all detector banks to prevent crashes when looking for FT 
-  region_fdet::region_fdet(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp, scint_ptr scp, trck_ptr trp, utrck_ptr utrp, traj_ptr trj,cher_ptr chp, ft_ptr ftp,event_ptr event,mcpar_ptr mcp):
-    region_particle(pars,ftbpars,cm,calp,scp,trp,utrp,trj,chp,ftp,event,mcp)
-  {
-    _region=clas12::FD;  
-  }
 
   region_fdet::region_fdet(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp, scint_ptr scp, trck_ptr trp, utrck_ptr utrp, traj_ptr trj,cher_ptr chp, ft_ptr ftp,event_ptr event,rich_ptr rich,mcpar_ptr mcp):
-    region_particle(pars,ftbpars,cm,calp,scp,trp,utrp,trj,chp,ftp,event,mcp),_rich{rich}
+    region_particle(pars,ftbpars,cm,calp,scp,trp,utrp,trj,chp,ftp,event,rich,mcp)
   {
     _region=clas12::FD;  
   }

diff --git a/Clas12Banks/region_fdet.h b/Clas12Banks/region_fdet.h
@@ -27,10 +27,6 @@ namespace clas12 {
 
     // region_fdet()=default;
     region_fdet(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm,
-		cal_ptr calp, scint_ptr scp, trck_ptr trp, utrck_ptr utrp,
-		traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,
-		mcpar_ptr mcp=nullptr);
-     region_fdet(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm,
 		cal_ptr calp, scint_ptr scp, trck_ptr trp, utrck_ptr utrp,
 		traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,
 		rich_ptr rich,mcpar_ptr mcp=nullptr);
@@ -102,7 +98,6 @@ namespace clas12 {
      private:
 
 
-    rich_ptr _rich={nullptr};
 
    //calorimeter indices
     short _pcal=-1;

diff --git a/Clas12Banks/region_ft.cpp b/Clas12Banks/region_ft.cpp
@@ -12,8 +12,8 @@ namespace clas12 {
   ///////////////////////////////////////////////////////
   ///Constructor used for event,
   ///give all detector banks to prevent crashes when looking for FD
-  region_ft::region_ft(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp, scint_ptr scp, trck_ptr trp,  utrck_ptr utrp, traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,mcpar_ptr mcp):
-    region_particle(pars,ftbpars,cm,calp,scp,trp,utrp,trj,chp,ftp,event,mcp)
+  region_ft::region_ft(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp, scint_ptr scp, trck_ptr trp,  utrck_ptr utrp, traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,rich_ptr rich,mcpar_ptr mcp):
+    region_particle(pars,ftbpars,cm,calp,scp,trp,utrp,trj,chp,ftp,event,rich,mcp)
   {
     _region=clas12::FT;
   }

diff --git a/Clas12Banks/region_ft.h b/Clas12Banks/region_ft.h
@@ -28,7 +28,7 @@ namespace clas12 {
      region_ft(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm,
 	       cal_ptr calp, scint_ptr scp,trck_ptr trp,utrck_ptr utrp,
 	       traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,
-	       mcpar_ptr mcp=nullptr);
+	       rich_ptr rich,mcpar_ptr mcp=nullptr);
     ~region_ft() final=default;
 
 

diff --git a/Clas12Banks/region_particle.cpp b/Clas12Banks/region_particle.cpp
@@ -41,7 +41,7 @@ namespace clas12 {
   // {
 
   // }
-  region_particle::region_particle(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp, scint_ptr scp, trck_ptr trp, utrck_ptr utrp, traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event, mcpar_ptr mcp):
+  region_particle::region_particle(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp, scint_ptr scp, trck_ptr trp, utrck_ptr utrp, traj_ptr trj, cher_ptr chp, ft_ptr ftp,event_ptr event,rich_ptr rich, mcpar_ptr mcp):
     _parts(pars),
     _ftbparts(ftbpars),
     _covmat(cm),
@@ -53,6 +53,7 @@ namespace clas12 {
     _cher(chp),
     _ft(ftp),
     _event(event),
+    _rich(rich),
     _mcpart(mcp)
   {
 

diff --git a/Clas12Banks/region_particle.h b/Clas12Banks/region_particle.h
@@ -52,7 +52,7 @@ namespace clas12 {
     region_particle(par_ptr pars,ftbpar_ptr ftbpars,covmat_ptr cm, cal_ptr calp,
 		    scint_ptr scp, trck_ptr trp, utrck_ptr utrp, traj_ptr trj,
 		    cher_ptr chp, ft_ptr ftp,event_ptr event,
-		    mcpar_ptr mcp=nullptr);
+		    rich_ptr rich,mcpar_ptr mcp=nullptr);
 
     virtual ~region_particle() =default;
 
@@ -113,7 +113,8 @@ namespace clas12 {
     virtual  utrck_ptr utrk(ushort lay) const{_utrck->setIndex(-1);return _utrck;};
     virtual  traj_ptr traj(ushort det,ushort layer=0) const{_traj->setIndex(-1);return _traj;};
     virtual  cher_ptr che(ushort lay) const{_cher->setIndex(-1);return _cher;};
-    virtual  rich_ptr rich() const{return nullptr;};
+    virtual  rich_ptr rich() const{	_rich->setIndex(-1);return _rich;}
+
     virtual  ft_ptr ft(ushort lay) const{_ft->setIndex(-1);return _ft;};
 
     const CovMatrix* cmat() const{_covmat->setIndex(_pcmat);return _covmat->matrix();};
@@ -171,7 +172,8 @@ namespace clas12 {
     traj_ptr _traj={nullptr};
     cher_ptr _cher={nullptr};
     event_ptr _event={nullptr};
-    // mcmatch_ptr _mcmatch={nullptr};
+    rich_ptr _rich={nullptr};
+     // mcmatch_ptr _mcmatch={nullptr};
     mcpar_ptr _mcpart={nullptr};
 
 

diff --git a/Clas12Root/ParticleHist.cpp b/Clas12Root/ParticleHist.cpp
@@ -30,6 +30,9 @@ namespace clas12root {
     _mapOfParts["HTCC"]="p->che(HTCC)->";
     _mapOfParts["LTCC"]="p->che(LTCC)->";
 
+   //Rich
+    _mapOfParts["RICH"]="p->rich()->";
+
     //Trackers
     _mapOfParts["DC"]="p->trk(DC)->";
     _mapOfParts["CVT"]="p->trk(CVT)->";

diff --git a/Clas12Root/ParticleTree.cpp b/Clas12Root/ParticleTree.cpp
@@ -32,6 +32,9 @@ namespace clas12root {
     _mapOfParts["HTCC"]="p->che(HTCC)->";
     _mapOfParts["LTCC"]="p->che(LTCC)->";
 
+    //Rich
+    _mapOfParts["RICH"]="p->rich()->";
+
     //Trackers
     _mapOfParts["DC"]="p->trk(DC)->";
     _mapOfParts["CVT"]="p->trk(CVT)->";