diff --git a/StRoot/StBFChain/BigFullChain.h b/StRoot/StBFChain/BigFullChain.h index 64c9c046cf0..917dd831eaa 100644 --- 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 b/StRoot/Sti/StiCATpcSeedFinder.cxx similarity index 97% rename from StRoot/StiCA/StiCATpcSeedFinder.cxx rename to StRoot/Sti/StiCATpcSeedFinder.cxx index 575a487efb8..eeefe44b25c 100644 --- a/StRoot/StiCA/StiCATpcSeedFinder.cxx +++ b/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 b/StRoot/Sti/StiCATpcSeedFinder.h similarity index 91% rename from StRoot/StiCA/StiCATpcSeedFinder.h rename to StRoot/Sti/StiCATpcSeedFinder.h index daf0a0bda8f..e300cbfcf18 100644 --- a/StRoot/StiCA/StiCATpcSeedFinder.h +++ b/StRoot/Sti/StiCATpcSeedFinder.h @@ -42,12 +42,4 @@ class StiCATpcSeedFinder: public StiTrackFinder std::vector *mSeeds; }; -class StiCALoader { -public: -static StiCATpcSeedFinder* New(); -#if 0 -ClassDef(StiCALoader,0) -#endif -}; - #endif diff --git a/StRoot/StiCA/StiCATpcTrackerInterface.cxx b/StRoot/Sti/StiCATpcTrackerInterface.cxx similarity index 100% rename from StRoot/StiCA/StiCATpcTrackerInterface.cxx rename to StRoot/Sti/StiCATpcTrackerInterface.cxx diff --git a/StRoot/StiCA/StiCATpcTrackerInterface.h b/StRoot/Sti/StiCATpcTrackerInterface.h similarity index 100% rename from StRoot/StiCA/StiCATpcTrackerInterface.h rename to StRoot/Sti/StiCATpcTrackerInterface.h diff --git a/StRoot/Sti/StiDefaultToolkit.cxx b/StRoot/Sti/StiDefaultToolkit.cxx index 7851fea4aac..8e203daceb3 100644 --- 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 index 0df341f33a7..db1f9b9204b 100644 --- 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";