💥DO NOT MERGE💥 ❗ add new TPC alignment, hit errors and slewing corrections for 2024

StRoot/StBFChain/BigFullChain.h

@@ -1093,6 +1093,7 @@ Bfc_st BFC[] = { // standard chains
   {"NoLocalCintDb","" ,"",""                                      ,"","","Switch off local Cint Db",kFALSE},
   {"NoMySQLDb"   ,""  ,"",""                                           ,"","","Switch off MySQL Db",kFALSE},
   {"NoCintCalDb" ,""  ,"","NoLocalCintDb"                         ,"","","Switch off local Cint Db",kFALSE},
+  {"NoTFGLDbTag" ,""  ,"",""                                ,"","","Switch off TFG specific Db tag",kFALSE},
   {"dbSnapshot"  ,""  ,"",""                                         ,"","","Create?use dbSnapshot",kFALSE},
   {"NoEvent"     ,""  ,"","-event,-analysis"      ,"","","Switch Off StEvent and StAnalysis Makers",kFALSE},
   {"MakeDoc"     ,""  ,"",""                   ,"","","Make HTML documentation for the given Chain",kFALSE},
@@ -1134,8 +1135,11 @@ Bfc_st BFC[] = { // standard chains
    ,                                                     "... Corr4+SCEbyE,OGridLeak3D,OSpaceZ2...",kFALSE},
   {"CorrX"       ,"" ,"","ExB,OShortR,OBmap,OPr13,OIFC,OSectorAlign,NewTpcAlignment"
    ",-AlignSectors,-OBmap2D,-OClock,-OTwist"                             ,"","","New Tpc Alignment",kFALSE},
-  {"CorrY"       ,"" ,"","ExB,OShortR,OBmap,OPr40,OIFC,OSectorAlign,NewTpcAlignment,OSpaceZ2,OGridLeakFull"
+  {"CorrY"       ,"" ,"","ExB,OShortR,OBmap,OPr40,-OPr13,OIFC,OSectorAlign,NewTpcAlignment,OSpaceZ2,OGridLeakFull"
    ",-AlignSectors,-OBmap2D,-OClock,-OTwist"                             ,"","","New Tpc Alignment",kFALSE},
+  {"Alignment2024","" ,"","NewTpcAlignment"                         ,"","","Turn on Alignment 2024",kFALSE},
+  {"CorrZ","" ,"","Alignment2024,TFGdbOpt,-CorrY,-CorrX,ExB,OShortR,OBmap,OPr40,-Opr13,OIFC,OSpaceZ2"
+   ",OGridLeakFull,-OBmap2D,-OClock,-OTwist,-OSectorAlign"              ,"","","Tpc Alignment 2024",kFALSE},
   {"ExB"         ,""  ,"","",""                                       ,"","Activate ExB correction",kFALSE},
   {"EB1"         ,""  ,"","",""                                     ,"","Force ExB configuration 1",kFALSE},
   {"EB2"         ,""  ,"","",""                                     ,"","Force ExB configuration 2",kFALSE},
@@ -1192,6 +1196,7 @@ Bfc_st BFC[] = { // standard chains
   {"useLDV" ,""  ,"","",""                                   ,"","... uses laserDV database flavor",kFALSE},
   {"useCDV" ,""  ,"","",""                                       ,"","... uses ofl database flavor",kFALSE},
   {"useNewLDV" ,""  ,"","",""                                    ,"","... uses ofl database flavor",kFALSE},
+  {"TFGdbOpt" ,""  ,"","",""                ,"","... uses TFG database flavor for alignemnt tables",kFALSE},
   {"------------","-----------","-----------","------------------------------------------","","","",kFALSE},
   {"Tables      ","-----------","-----------","------------------------------------------","","","",kFALSE},
   {"------------","-----------","-----------","------------------------------------------","","","",kFALSE},
@@ -1725,7 +1730,7 @@ Bfc_st BFC[] = { // standard chains
 
 
   // Sti/Stv chains
-  {"Sti"      ,"Sti","","StiLib,StiLibs,SCL,StEvent,StDbT,TpcIT,compend,sim_T,tbutil","StiMaker"
+  {"Sti"      ,"Sti","","StiLib,StiLibs,SCL,StEvent,dbutil,StDbT,TpcIT,compend,sim_T,tbutil","StiMaker"
    ,                      "StEventUtilities,StiUtilities,StiMaker","Sti tracker",kFALSE},
   {"StiCA"      ,"Sti","","Sti","StiMaker","TPCCATracker"                          ,"StiCA tracker",kFALSE},
   {"StiCAPerf","","","","",                             "TPCCATrackerPerformance", "CA Performance",kFALSE},
@@ -1784,7 +1789,7 @@ Bfc_st BFC[] = { // standard chains
   {"ETofQa",     "",     "ETofChain", "db, ETofUtil, muDst", "StETofQAMaker",    "StETofQAMaker",
                                                                                     "ETOF QA maker",kFALSE},
 
-  {"ETofA",  "",    "","etofdat,ETofCalib,etofhit,ETofMatch","","... ETOF chain options for data",  kFALSE},
+  {"ETofA",  "", "","etofdat,ETofCalib,etofhit,ETofMatch","","","... ETOF chain options for data",  kFALSE},
 
 
   // the below needs to be done earlier to save time - leaving here for documentation purposes as two

StRoot/StBFChain/StBFChain.cxx

@@ -292,6 +292,8 @@ Int_t StBFChain::Instantiate()
 	  // Determine flavors
 	  TString flavors = "ofl"; // default flavor for offline
 
+	  // TFG specific Db tag
+	  if (! GetOption("NoTFGLDbTag")) flavors += "+TFG";
 	  // fixed target flavor
 	  if (GetOption("FXT")) flavors.Prepend("FXT+");
 
@@ -761,6 +763,8 @@ Int_t StBFChain::Instantiate()
       if ( GetOption("useLDV")    ) mk->SetAttr("useLDV",kTRUE) ;// uses laserDV database
       if ( GetOption("useCDV")    ) mk->SetAttr("useCDV",kTRUE) ;// uses ofl database
       if ( GetOption("useNewLDV") ) mk->SetAttr("useNewLDV",kTRUE);// uses new laserDV
+      if ( GetOption("Alignment2024")     ) mk->SetAttr("Alignment2024",kTRUE);// uses new Alignment2024
+      if ( GetOption("Cosmics")   ) mk->SetAttr("Cosmics"    ,kTRUE);
       if ( GetOption("shadow")    ) mk->SetAttr("NoReset",kTRUE);// no resetting ExB
       if ( GetOption("ExB")){
 	mk->SetAttr("ExB", kTRUE);	// bit 0 is ExB ON or OFF
@@ -1922,6 +1926,18 @@ void StBFChain::SetDbOptions(StMaker *mk){
     if (GetOption("NoSsdIt"))                         {mk->SetAttr("blacklist", "ssd");  gMessMgr->QAInfo() << "blacklist ssd" << endm;}
     if (GetOption("NoSstIt"))                         {mk->SetAttr("blacklist", "sst");  gMessMgr->QAInfo() << "blacklist sst" << endm;}
   }
+  if (GetOption("TFGdbOpt")) {
+    const Char_t *TFGTables[] = {"tpcSectorT0offset", "starTriggerDelay", 
+				 "TpcPosition", "TpcHalfPosition", "TpcWheelPosition", 
+				 "TpcSuperSectorPositionB", "TpcSuperSectorPositionD", 
+				 "TpcInnerSectorPositionB", "TpcOuterSectorPositionB", 
+				 "tpcBXT0CorrEPD", "tpcTimeBucketCor", 0};
+    LOG_INFO << "TFG version for TPC alignment parameters" << endm;
+    for (Int_t i = 0; TFGTables[i]; i++) {
+      LOG_INFO << "SetFlavor(\"TFG\",\"" << TFGTables[i] << "\"); // disable sim+ofl" << endm; 
+      mk->SetFlavor("TFG",TFGTables[i]);
+    }
+  }
 }
 //_____________________________________________________________________
 /// Creates output-tree branches

StRoot/StDbUtilities/StGlobalDirection.hh

@@ -6,8 +6,8 @@
 class StGlobalDirection : public StGlobalCoordinate {
 public:
   StGlobalDirection() : StGlobalCoordinate() {}
-  StGlobalDirection(const double x, const double y, const double z) :
-    StGlobalCoordinate(x,y,z) {}
+  StGlobalDirection(const double x, const double y, const double z) : StGlobalCoordinate(x,y,z) {}
+  StGlobalDirection(const double *x) : StGlobalCoordinate(x) { }
   StGlobalDirection(const StThreeVector<double>& xyz) : StGlobalCoordinate(xyz) {}
   StGlobalDirection(const StThreeVectorF& xyz) :  StGlobalCoordinate(xyz) {}
   virtual ~StGlobalDirection() {};

StRoot/StDbUtilities/StTpcCoordinate.cxx

@@ -7,6 +7,7 @@
 #include "StTpcLocalSectorAlignedCoordinate.hh"
 #include "StTpcLocalSectorDirection.hh"
 #include "StTpcLocalSectorCoordinate.hh"
+#include "Stiostream.h"
 //________________________________________________________________________________
 StTpcLocalCoordinate::StTpcLocalCoordinate(double x, double y, double z) : StTpcCoordinate(x,y,z,0,0) {}
 //________________________________________________________________________________
@@ -21,6 +22,8 @@ ostream& operator<<(ostream& os, const StTpcCoordinate& a) {
   return os << OS;
 }
 //________________________________________________________________________________
+void StTpcCoordinate::Print(Option_t *option) const {cout << *this << endl;}
+//________________________________________________________________________________
 ostream& operator<<(ostream& os, const StTpcLocalDirection& a) {
   return os << "TPC_Local Direction( (" << OS;
 }

StRoot/StDbUtilities/StTpcCoordinate.h

@@ -4,7 +4,6 @@
  */
 #ifndef ST_TPC_COORDINATE_H
 #define ST_TPC_COORDINATE_H
-#include "Stiostream.h"
 #include "StThreeVector.hh"
 
 class StTpcCoordinate {
@@ -27,6 +26,7 @@ class StTpcCoordinate {
   virtual void  setPosition(StThreeVector<double>& position) { mPosition = position; }
   virtual void  setSector(Int_t sector)            { mFromSector = sector; }
   virtual void  setRow(Int_t row)                  { mFromRow   = row; }
+  virtual void  Print(Option_t *option="") const;
 protected:
   StThreeVector<double> mPosition;
   Int_t                 mFromSector;