Remove StTpcDb dependence for StEventUtilities

star-bnl · Mar 20, 2021 · 79e3801 · 79e3801
1 parent 44f81c4
commit 79e3801
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 19 deletions.
diff --git a/StRoot/StBFChain/BigFullChain.h b/StRoot/StBFChain/BigFullChain.h
@@ -1338,7 +1338,7 @@ Bfc_st BFC[] = { // standard chains
   {"PmdUtil"     ,""  ,"","","",                                       "StPmdUtil","Load StPmdUtil",kFALSE},
 
   {"QUtils"      ,""  ,"","PmdUtil,EmcUtil","",                      "","Load QA Libs dependencies",kFALSE},
-  {"Stu"         ,""  ,"","","",                 "StTpcDb,StEventUtilities","Load StEventUtilities",kFALSE},
+  {"Stu"         ,""  ,"","","",                         "StEventUtilities","Load StEventUtilities",kFALSE},
 
 #ifndef  __NoStrangeMuDst__
   {"MuDSTDeps"   ,"","","StEvent,Stu,StBichsel",""

diff --git a/StRoot/StEventUtilities/StEbyET0.cxx b/StRoot/StEventUtilities/StEbyET0.cxx
@@ -8,11 +8,13 @@
 #include "StEvent/StTpcHit.h"
 #include "StEvent/StTpcHitCollection.h"
 #include "StEvent/StTriggerData.h"
+#include "StDetectorDbMaker/St_EbyET0C.h"
+/*
 #include "StDetectorDbMaker/St_tpcPadConfigC.h"
 #include "StDetectorDbMaker/St_tpcTimeBucketCorC.h"
-#include "StDetectorDbMaker/St_EbyET0C.h"
 #include "StDbUtilities/StTpcCoordinateTransform.hh"
 #include "StTpcDb/StTpcDb.h"
+*/
 #include "TFile.h"
 #include "TNtupleD.h"
 #include "StEbyET0.h"
@@ -52,7 +54,6 @@ double StEbyET0::getTime(StEvent* event, int mode) {
   St_EbyET0C* ebyeTable = St_EbyET0C::instance();
   for (int row = 0; row < ebyeTable->GetNRows(); row++) {
     int detector = ebyeTable->detector(row);
-printf("EbyET0 : trying %d\n",detector);
     if (detector < 0) break; // end of active rows in the table
 
     double coordinate = -9e23;
@@ -93,7 +94,6 @@ printf("EbyET0 : trying %d\n",detector);
     break;
   }
 
-printf("YYY %d\n",sizeof(EbyET0_st));
   return mTime;
 }
 //_____________________________________________________________________________
@@ -158,12 +158,6 @@ void StEbyET0::getTriggerInfo(StEvent* event, trigDetType trigDet, double* info)
 //_____________________________________________________________________________
 void StEbyET0::getTpcInfo(StEvent* event, double* info) {
 
-  // parameters: prompt hit windows
-  static const double innerMinTB = 7.7;
-  static const double innerMaxTB = 10.5;
-  static const double outerMinTB = 2.0;
-  static const double outerMaxTB = 5.0;
-
   // counters
   double tie = 0.; // hit times sum
   double tiw = 0.;
@@ -178,6 +172,13 @@ void StEbyET0::getTpcInfo(StEvent* event, double* info) {
   double roe = 0.;
   double row = 0.;
 
+/*
+  // parameters: prompt hit windows
+  static const double innerMinTB = 7.7;
+  static const double innerMaxTB = 10.5;
+  static const double outerMinTB = 2.0;
+  static const double outerMaxTB = 5.0;
+
   // coordinate transform to get time of hit
   static StTpcCoordinateTransform* mTpcTransForm = 0;
   if (! mTpcTransForm) mTpcTransForm = new StTpcCoordinateTransform(gStTpcDb);
@@ -238,6 +239,7 @@ void StEbyET0::getTpcInfo(StEvent* event, double* info) {
       } // padrow for-loop
     } // sector for-loop
   } // tpcHits
+*/
 
   // pass back the average time, number of hits, and average padrow
   info[ 0] = (nie > 0 ? tie/nie : 0); info[ 1] = nie; info[ 2] = (nie > 0 ? rie/nie : 0);
@@ -248,8 +250,11 @@ void StEbyET0::getTpcInfo(StEvent* event, double* info) {
   return;
 }
 //_____________________________________________________________________________
-// $Id: StEbyET0.cxx,v 1.1 2021/03/19 01:44:47 genevb Exp $
+// $Id: StEbyET0.cxx,v 1.2 2021/03/20 02:38:13 genevb Exp $
 // $Log: StEbyET0.cxx,v $
+// Revision 1.2  2021/03/20 02:38:13  genevb
+// Remove StTpcDb dependence for StEventUtilities
+//
 // Revision 1.1  2021/03/19 01:44:47  genevb
 // Introduce Event-by-Event T0 corrections
 //

diff --git a/StRoot/StMuDSTMaker/COMMON/macros/loadSharedLibraries.C b/StRoot/StMuDSTMaker/COMMON/macros/loadSharedLibraries.C
@@ -18,7 +18,6 @@ void loadSharedLibraries() {
   gSystem->Load("StTriggerDataMaker"); // new starting from April 2003
   gSystem->Load("StBichsel");
   gSystem->Load("StEvent");
-  gSystem->Load("StTpcDb");
   gSystem->Load("StEventUtilities");
   gSystem->Load("StDbLib");
   gSystem->Load("StEmcUtil");

diff --git a/StRoot/macros/analysis/doEvents.C b/StRoot/macros/analysis/doEvents.C
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// $Id: doEvents.C,v 1.110 2021/03/19 14:49:29 genevb Exp $
+// $Id: doEvents.C,v 1.111 2021/03/20 02:38:13 genevb Exp $
 // Description: 
 // Chain to read events from files or database into StEvent and analyze.
 // what it does: reads .dst.root or .xdf files and then runs StEventMaker
@@ -356,7 +356,6 @@ void loadLibs(const char *opt)
     gSystem->Load("StTriggerDataMaker"); // new starting from April 2003
     gSystem->Load("StBichsel");
     gSystem->Load("StEvent");
-    gSystem->Load("StTpcDb");
     gSystem->Load("StEventUtilities");
     gSystem->Load("StEmcUtil");
     gSystem->Load("StTofUtil");
@@ -376,6 +375,7 @@ void loadLibs(const char *opt)
     gSystem->Load("StDbBroker.so");
     gSystem->Load("libStDb_Tables.so");
     gSystem->Load("St_db_Maker.so");
+    gSystem->Load("StTpcDb");
     gSystem->Load("StDetectorDbMaker");
   }
 
@@ -486,6 +486,9 @@ int gcInit(const char *request)
 //____________________________________________________________________________
 //////////////////////////////////////////////////////////////////////////////
 // $Log: doEvents.C,v $
+// Revision 1.111  2021/03/20 02:38:13  genevb
+// Remove StTpcDb dependence for StEventUtilities
+//
 // Revision 1.110  2021/03/19 14:49:29  genevb
 // Add StTpcDb dependency for StEvenntUtilities
 //

diff --git a/StRoot/macros/analysis/find_vertex.C b/StRoot/macros/analysis/find_vertex.C
@@ -97,7 +97,6 @@ void find_vertex(char * fname="high_053/st_physics_6053108_raw_2020002.event.roo
     gSystem->Load("StTriggerDataMaker"); // new starting from April 2003
     gSystem->Load("StBichsel");
     gSystem->Load("StEvent");
-    gSystem->Load("StTpcDb");
     gSystem->Load("StEventUtilities");
     gSystem->Load("StEmcUtil"); 
     gSystem->Load("StTofUtil");
@@ -247,8 +246,11 @@ void find_vertex(char * fname="high_053/st_physics_6053108_raw_2020002.event.roo
 
 
 //
-// $Id: find_vertex.C,v 3.2 2021/03/19 14:49:29 genevb Exp $
+// $Id: find_vertex.C,v 3.3 2021/03/20 02:38:13 genevb Exp $
 // $Log: find_vertex.C,v $
+// Revision 3.3  2021/03/20 02:38:13  genevb
+// Remove StTpcDb dependence for StEventUtilities
+//
 // Revision 3.2  2021/03/19 14:49:29  genevb
 // Add StTpcDb dependency for StEvenntUtilities
 //

diff --git a/StRoot/macros/graphics/GeomBrowse.C b/StRoot/macros/graphics/GeomBrowse.C
@@ -20,7 +20,7 @@ void GeomDrawUsage() {
           printf("One always can select the geometry from the \"file menu\" of the GUI interface later on too\n");          
           printf("\n");                
           printf("---------------\n"); 
-          printf("\n$Id: GeomBrowse.C,v 1.16 2021/03/19 14:49:29 genevb Exp $\n");
+          printf("\n$Id: GeomBrowse.C,v 1.17 2021/03/20 02:38:13 genevb Exp $\n");
 }                 
 //_____________________________________________________________________________________________________________
 StGeomBrowser *GeomBrowse(const char *fzFile="y2009")
@@ -37,7 +37,6 @@ StGeomBrowser *GeomBrowse(const char *fzFile="y2009")
    gSystem->Load("StUtilities");
    gSystem->Load("StarClassLibrary");  
    gSystem->Load("StEvent");  
-   gSystem->Load("StTpcDb");  
    gSystem->Load("StEventUtilities"); 
    gSystem->Load("St_geom_Maker");  
    StGeomBrowser *a = new StGeomBrowser;

diff --git a/StRoot/macros/loadMuDst.C b/StRoot/macros/loadMuDst.C
@@ -10,7 +10,6 @@ void loadMuDst() {
 //  gSystem->Load("StTriggerDataMaker"); // new starting from April 2003
   gSystem->Load("StBichsel");
   gSystem->Load("StEvent");
-  gSystem->Load("StTpcDb");
   gSystem->Load("StEventUtilities");
   gSystem->Load("StTriggerDataMaker"); // new starting from April 2003
   gSystem->Load("StDbLib");