Merge branch 'main' into fst-tracking-mode

star-bnl · Nov 13, 2024 · b90b057 · b90b057
2 parents 501243a + a34894e
commit b90b057
Show file tree

Hide file tree

Showing 53 changed files with 2,256 additions and 804 deletions.
diff --git a/StDb/idl/etofGet4State.idl b/StDb/idl/etofGet4State.idl
@@ -0,0 +1,16 @@
+/* etofGet4State.idl
+*
+* table: etofGet4State
+*
+* description:Get4States and state changes dealing with "Clock-Jumps"
+*             0 - good,  1 - too early by 6.25ns ,2 too late by 6.25 ns,3 - bad
+*
+* author: Yannick Söhngen ( PI Heidelberg )
+*
+*/
+
+struct etofGet4State {
+
+  unsigned long etofGet4State[1000000]; /* state of get4s, changes & event id */
+
+};
diff --git a/StRoot/StAnalysisUtilities/StHistUtil.cxx b/StRoot/StAnalysisUtilities/StHistUtil.cxx
@@ -960,25 +960,36 @@ Int_t StHistUtil::DrawHists(const Char_t *dirName) {
           } else graphPad->cd(m_QAShiftMode ? 0 : curPad);
 
           // set x & y grid off by default
+	  TRegexp bsmdPerModule("bsmd.*PerModule");
 	  gPad->SetGridy(0);
           if (oName.Contains("H_matchCand")) {
             gPad->SetGridx(1);
             gStyle->SetGridStyle(6);
             gStyle->SetGridColor(kOrange);
+          } else if (oName.Contains(bsmdPerModule)) {
+	    hobj->GetXaxis()->SetNdivisions(15);
+	    hobj->GetXaxis()->SetLabelSize(0.03);
+	    hobj->GetXaxis()->SetTitle("Module Number");
+            gPad->SetGridx();	    
           } else {
 	    gPad->SetGridx(0);
             gStyle->SetGridStyle(3);
             gStyle->SetGridColor(kGray);
           }
 
           // set stats to draw
+	  TRegexp bsmd2DPerModule("bsmd.*Strip.*PerModule");
           if (oName.Contains("TpcSector") ||
               oName.Contains("PointRPTpc") ||
               oName.Contains("PointXYTpc") ||
               oName.Contains("TrigBits")) {
             gStyle->SetOptStat(11);
           } else if (oName.Contains("NullPrim")) {
             gStyle->SetOptStat(1111);
+	  } else if (oName.Contains(bsmd2DPerModule)) {
+	    gStyle->SetOptStat(0);
+	    hobj->GetYaxis()->SetTitle("Strip Within Module");
+	    hobj->GetYaxis()->SetTitleOffset(1.4);
           } else {
             gStyle->SetOptStat(111111);
           }

diff --git a/StRoot/StBFChain/BFC.C b/StRoot/StBFChain/BFC.C
@@ -1,4 +1,4 @@
-#if !defined(__CINT__)
+#if !defined(__CINT__) && !defined(__CLING__)
 #include "TROOT.h"
 #endif
 #include "Bfc.h"

diff --git a/StRoot/StBFChain/BigFullChain.h b/StRoot/StBFChain/BigFullChain.h
diff --git a/StRoot/StBFChain/StBFChain.cxx b/StRoot/StBFChain/StBFChain.cxx
@@ -730,8 +730,10 @@ Int_t StBFChain::Instantiate()
       if ( GetOption("EastOff"))      mk->SetAttr("EastOff",kTRUE);
       if ( GetOption("WestOff"))      mk->SetAttr("WestOff",kTRUE);
     }
-    if (maker == "StEventQAMaker" && GetOption("QAalltrigs"))
-      ProcessLine(Form("((StEventQAMaker *) %p)->AllTriggers();",mk));
+    if (maker == "StEventQAMaker") {
+      if ( GetOption("QAalltrigs"))   mk->SetAttr("allTrigs",kTRUE);
+      if ( GetOption("QAallevents"))  mk->SetAttr("allEvents",kTRUE);
+    }
     //Special options for V0s and Xis using estGlobal tracks
     if(maker=="StV0FinderMaker" && Key=="v0svt"){
       TString cmd(Form("StV0FinderMaker *V0mk=(StV0FinderMaker*) %p;",mk));

diff --git a/StRoot/StDAQMaker/StSCReader.cxx b/StRoot/StDAQMaker/StSCReader.cxx
@@ -36,8 +36,9 @@ void StSCReader::FillTime(  unsigned int utime)
   //but new DAQ reader only gets used for 2009+ anyhow
   time_t UTime = utime; //er->getEventInfo().UnixTime;
   struct tm *time=gmtime(&UTime);
-  flipBBCBkg = (time->tm_year > 95 && time->tm_year < 109 ? 1 : 0) ;
-  useNoKillers = (time->tm_year > 110 ? 1 : 0);;
+  flipBBCBkg = (time->tm_year > 95 && time->tm_year < 109 ? 1 : 0);
+  useNoKillers = (time->tm_year > 110);
+  useEPD = (time->tm_year > 118 || (time->tm_year == 118 && time->tm_mon > 2));
 }
 
 double StSCReader::getCTBWest() {
@@ -80,6 +81,10 @@ double StSCReader::getZDCXNoKiller() {
   return sc.rich_scalers[14];
 }
 
+double StSCReader::getEPDX() {
+  return sc.rich_scalers[13];
+}
+
 double StSCReader::getMult() {
   return sc.rich_scalers[10];
 }
@@ -170,7 +175,11 @@ TDataSet* StSCReader::getSCTable(unsigned long runno) {
     tb->ctbEast      = getCTBEast();
     tb->ctbTOFp      = getCTBOrTOFp();
   }
-  tb->tofp         = getTOFp();
+  if (useEPD) { // use otherwise empty space
+    tb->tofp         = getEPDX();
+  } else {
+    tb->tofp         = getTOFp();
+  }
   tb->zdcWest      = getZDCWest();
   tb->zdcEast      = getZDCEast();
   tb->zdcX         = getZDCX();

diff --git a/StRoot/StDAQMaker/StSCReader.h b/StRoot/StDAQMaker/StSCReader.h
@@ -36,6 +36,7 @@ class StSCReader
     double getZDCWestNoKiller();
     double getZDCEastNoKiller();
     double getZDCXNoKiller();
+    double getEPDX();
     double getMult();
     double getL0();
     double getBBCX();
@@ -56,7 +57,8 @@ class StSCReader
 
     sc_t *fSC;
     short flipBBCBkg;
-    short useNoKillers;
+    bool useNoKillers;
+    bool useEPD;
 };
 
 #endif
diff --git a/StRoot/StDaqLib/SC/SC_Reader.cxx b/StRoot/StDaqLib/SC/SC_Reader.cxx
@@ -57,6 +57,10 @@ int SC_Reader::ZDCXNoKiller() {
   return sc.rich_scalers[14];
 } 
 
+int SC_Reader::EPDX() {
+  return sc.rich_scalers[13];
+} 
+
 int SC_Reader::PVPDEast() {
   return sc.rich_scalers[8];
 } 

diff --git a/StRoot/StDaqLib/SC/SC_Reader.hh b/StRoot/StDaqLib/SC/SC_Reader.hh
@@ -16,6 +16,7 @@ public:
   int ZDCWestNoKiller();
   int ZDCEastNoKiller();
   int ZDCXNoKiller();
+  int EPDX();
   int Mult();
   int L0();
   int BBCX();

diff --git a/StRoot/StDetectorDbMaker/St_spaceChargeCorC.cxx b/StRoot/StDetectorDbMaker/St_spaceChargeCorC.cxx
@@ -35,6 +35,7 @@ Double_t St_spaceChargeCorC::getSpaceChargeCoulombs(Double_t scaleFactor)
         case (13) : mult = scalers->getCTBOrTOFp(); break; // zdcx-no-killer as of 2011
         case (14) : mult = scalers->getCTBEast(); break; // zdce-no-killer as of 2011
         case (15) : mult = scalers->getCTBWest(); break; // zdcw-no-killer as of 2011
+        case (16) : mult = scalers->getEPDX(); break; // EPD after March 2018
 
         default  : mult = 0.;
       }

diff --git a/StRoot/StDetectorDbMaker/St_trigDetSumsC.h b/StRoot/StDetectorDbMaker/St_trigDetSumsC.h
@@ -21,6 +21,7 @@ class St_trigDetSumsC : public TChair {
   Double_t 	ctbEast(Int_t i = 0) 	        {return validity(Struct(i)->ctbEast);}
   Double_t 	ctbTOFp(Int_t i = 0) 	        {return validity(Struct(i)->ctbTOFp);}
   Double_t 	tofp(Int_t i = 0) 	        {return validity(Struct(i)->tofp);}
+  Double_t 	epdx(Int_t i = 0) 	        {return validity(Struct(i)->tofp);} // re-use for EPD
   Double_t 	zdcWest(Int_t i = 0) 	        {return validity(Struct(i)->zdcWest);}
   Double_t 	zdcEast(Int_t i = 0) 	        {return validity(Struct(i)->zdcEast);}
   Double_t 	zdcX(Int_t i = 0) 	        {return validity(Struct(i)->zdcX);}
@@ -42,6 +43,7 @@ class St_trigDetSumsC : public TChair {
   Double_t getCTBEast() {return ctbEast();}
   Double_t getCTBOrTOFp() {return ctbTOFp();}
   Double_t getTOFp() {return tofp();}
+  Double_t getEPDX() {return epdx();}
   Double_t getZDCWest() {return zdcWest();}
   Double_t getZDCEast() {return zdcEast();}
   Double_t getZDCX() {return zdcX();}