Revert "Cleanup of the StFwdTrackMaker code"

This reverts commit 0241f63.
star-bnl · Jul 19, 2024 · 501243a · 501243a
1 parent e0dfc4d
commit 501243a
Show file tree

Hide file tree

Showing 7 changed files with 1,657 additions and 1,038 deletions.
diff --git a/StRoot/StFwdTrackMaker/StFwdTrackMaker.cxx b/StRoot/StFwdTrackMaker/StFwdTrackMaker.cxx
diff --git a/StRoot/StFwdTrackMaker/StFwdTrackMaker.h b/StRoot/StFwdTrackMaker/StFwdTrackMaker.h
diff --git a/StRoot/StFwdTrackMaker/include/Tracker/FwdGeomUtils.h b/StRoot/StFwdTrackMaker/include/Tracker/FwdGeomUtils.h
@@ -49,11 +49,11 @@ class FwdGeomUtils {
         }
         double fttZ( int index ) {
 
-            // This ftt_z_delta is needed to match the z location of hits (midpint of active volume?) to the z location of the mother volume.
+            // This ftt_z_delta is needed to match the z location of hits (midpint of active volume?) to the z location of the mother volume.  
             // NOTE: It may be possible to improve this when the higher precision FTT geometry model is added
             const double ftt_z_delta = -0.5825245;
             stringstream spath;
-            spath << "/HALL_1/CAVE_1/STGM_1/STFM_" << (index + 1) * 4 << "/";
+            spath << "/HALL_1/CAVE_1/STGM_1/STFM_" << (index + 1) * 4 << "/"; 
             bool can = cd( spath.str().c_str() );
             if ( can && _matrix != nullptr ){
                 return _matrix->GetTranslation()[2] + ftt_z_delta;
@@ -75,12 +75,12 @@ class FwdGeomUtils {
             // the index are now 4,5,6
             // hence +4 below
             // also fixed typo, previously was incorrectly FTSD_
-            const double z_delta = 1.755;
+
             stringstream spath;
-            spath << "/HALL_1/CAVE_1/FSTM_1/FSTD_" << (index + 4) << "/";
+            spath << "/HALL_1/CAVE_1/FSTM_1/FSTD_" << (index + 4) << "/"; 
             bool can = cd( spath.str().c_str() );
             if ( can && _matrix != nullptr ){
-                return _matrix->GetTranslation()[2] + z_delta;
+                return _matrix->GetTranslation()[2];
             }
             return 0.0;
         }
@@ -94,4 +94,4 @@ class FwdGeomUtils {
     TGeoManager   *_gMan      = nullptr;
 };
 
-#endif
+#endif
diff --git a/StRoot/StFwdTrackMaker/include/Tracker/FwdHit.h b/StRoot/StFwdTrackMaker/include/Tracker/FwdHit.h
@@ -93,16 +93,11 @@ class FwdHit : public KiTrack::IHit {
                                  // cleaner in future.
         }
     };
-    bool isFst() const { return _z <= 250.0 && _z > 125; } // approximate Z-locations of FST
-    bool isFtt() const { return _z > 250.0 && _z < 355; } // sTGC is approximately 280 -> 350
-
-    std::shared_ptr<McTrack> getMcTrack() { return _mcTrack; }
 
     const KiTrack::ISectorSystem *getSectorSystem() const {
         return FwdSystem::sInstance;
     }
 
-    void setSector( int s ){ _sector = s; }
     int getTrackId() { return _tid;}
     int _tid; // aka ID truth
     int _vid; // volume id
@@ -113,8 +108,7 @@ class FwdHit : public KiTrack::IHit {
     StHit *_hit;
 };
 
-// Track Seed typdef
-typedef std::vector<KiTrack::IHit *> Seed_t;
+using Seed_t = std::vector<KiTrack::IHit *>;
 
 class FwdConnector : public KiTrack::ISectorConnector {
   public: