refactor: move StiCA functionality to Sti package (#640)

Resolves #628
star-bnl · Jan 31, 2024 · 4298c80 · 4298c80
1 parent 6df0792
commit 4298c80
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 17 deletions.
diff --git a/StRoot/StBFChain/BigFullChain.h b/StRoot/StBFChain/BigFullChain.h
@@ -1715,7 +1715,7 @@ Bfc_st BFC[] = { // standard chains
   // Sti/Stv chains
   {"Sti"      ,"Sti","","StiLib,StiLibs,SCL,StEvent,StDbT,TpcIT,compend,sim_T,tbutil","StiMaker"
    ,                      "StEventUtilities,StiUtilities,StiMaker","Sti tracker",kFALSE},
-  {"StiCA"      ,"Sti","","Sti","StiMaker","TPCCATracker,StiCA"                    ,"StiCA tracker",kFALSE},
+  {"StiCA"      ,"Sti","","Sti","StiMaker","TPCCATracker"                          ,"StiCA tracker",kFALSE},
   {"StiCAPerf","","","","",                             "TPCCATrackerPerformance", "CA Performance",kFALSE},
   {"StiCA"    ,"Sti","","Sti,StiLib,StiCALib,StiLibs,SCL,StEvent,StDbT,TpcIT,compend,tbutil","StiMaker"
    ,                                "StEventUtilities,libEG,StiUtilities,StiMaker","Sti+CA tracker",kFALSE},

diff --git a/StRoot/StiCA/StiCATpcSeedFinder.cxx → StRoot/Sti/StiCATpcSeedFinder.cxx b/StRoot/StiCA/StiCATpcSeedFinder.cxx → StRoot/Sti/StiCATpcSeedFinder.cxx
@@ -192,5 +192,3 @@ StiDebug::Count("Reused_Pct",reUsed, pct);
   }
   mEnded = 3; return 0;
 }
-//________________________________________________________________________________
-StiCATpcSeedFinder* StiCALoader::New() { return new StiCATpcSeedFinder;}
diff --git a/StRoot/StiCA/StiCATpcSeedFinder.h → StRoot/Sti/StiCATpcSeedFinder.h b/StRoot/StiCA/StiCATpcSeedFinder.h → StRoot/Sti/StiCATpcSeedFinder.h
@@ -42,12 +42,4 @@ class StiCATpcSeedFinder: public StiTrackFinder
   std::vector<Seed_t> *mSeeds;
 };
 
-class StiCALoader {
-public:
-static StiCATpcSeedFinder* New();
-#if 0
-ClassDef(StiCALoader,0)
-#endif
-};
-
 #endif
diff --git a/StRoot/StiCA/StiCATpcTrackerInterface.cxx → StRoot/Sti/StiCATpcTrackerInterface.cxx b/StRoot/StiCA/StiCATpcTrackerInterface.cxx → StRoot/Sti/StiCATpcTrackerInterface.cxx
diff --git a/StRoot/StiCA/StiCATpcTrackerInterface.h → StRoot/Sti/StiCATpcTrackerInterface.h b/StRoot/StiCA/StiCATpcTrackerInterface.h → StRoot/Sti/StiCATpcTrackerInterface.h
diff --git a/StRoot/Sti/StiDefaultToolkit.cxx b/StRoot/Sti/StiDefaultToolkit.cxx
@@ -390,6 +390,7 @@
 #include "Sti/StiDefaultTrackFilter.h"
 #include "Sti/StiDetectorGroup.h"
 #include "Sti/StiDetectorGroups.h"
+#include "Sti/StiCATpcSeedFinder.h"
 #include "StDetectorDbMaker/StiHitErrorCalculator.h"
 #include "StiTpc/StiTpcHitLoader.h"
 #include "StiSvt/StiSvtHitLoader.h"
@@ -639,11 +640,7 @@ StiTrackFinder   * StiDefaultToolkit::getTrackSeedFinderKNN()
 //______________________________________________________________________________
 StiTrackFinder   * StiDefaultToolkit::getTrackSeedFinderCA()
 {
-  gSystem->Load("TPCCATracker");
-  gSystem->Load("StiCA");
-  auto *mySeed = (StiTrackFinder*)gROOT->ProcessLineFast("StiCALoader::New()");
-  assert(mySeed);
-  return mySeed;
+  return new StiCATpcSeedFinder();
 }
 
 //______________________________________________________________________________

diff --git a/mgr/Conscript-standard b/mgr/Conscript-standard
@@ -895,7 +895,7 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) {
 	$CPPPATH = "#StarVMC" . $main::PATH_SEPARATOR . $CPPPATH;
 	#    print "StarVMC change CPPPATH to $CPPPATH =========\n";
 
-    } elsif ($pkg eq "TPCCATracker" or $pkg eq "StiCA") {
+    } elsif ($pkg eq "TPCCATracker" or $pkg eq "Sti") {
         $CPPPATH .=
 	  $main::PATH_SEPARATOR . "#" . $Dir . $main::PATH_SEPARATOR . "#" . $Dir . "/code";