incorporate updates from dev

star-bnl · Jan 13, 2025 · cb2cf06 · cb2cf06
1 parent 5c4fc21
commit cb2cf06
Show file tree

Hide file tree

Showing 19 changed files with 2,942 additions and 2,683 deletions.
diff --git a/StRoot/StEvent/StEnumerations.h b/StRoot/StEvent/StEnumerations.h
@@ -400,7 +400,9 @@ enum StVertexId {kUndefinedVtxId   = kUndefinedVertexIdentifier,
                  kFtpcEastCalVtxId = kFtpcEastCalibrationVertexIdentifier,
                  kFtpcWestCalVtxId = kFtpcWestCalibrationVertexIdentifier,
 		         kBEAMConstrVtxId,
-                 kRejectedVtxId};
+                 kRejectedVtxId,
+                 kFwdVtxId
+                 };
 
 /*!
  * \enum StRichPidFlag

diff --git a/StRoot/StEvent/StFstConsts.h b/StRoot/StEvent/StFstConsts.h
@@ -52,8 +52,8 @@ const float kFstrStart[kFstNumRStripsPerWedge]= {5.000, 7.875, 10.750, 13.625, 1
 const float kFstrStop[kFstNumRStripsPerWedge] = {7.875, 10.750, 136.25, 16.500, 19.375, 22.250, 25.125, 28.000}; // in cm
 
 //general APV chip constants
-const unsigned char kFstNumTimeBins = 9;    // 9 time bins for ADC sampling (maximum time bin number, 3 or 9)
-const unsigned char kFstDefaultTimeBin = 2; // the default time bin number (2nd time bin) for FST raw hits
+const unsigned char kFstNumTimeBins = 3;    // 9 time bins for ADC sampling (maximum time bin number, 3 or 9)
+const unsigned char kFstDefaultTimeBin = 1; // the default time bin number (2nd time bin) for FST raw hits
 const int kFstMaxAdc                = 4096; // ADC value should be less than 4096 (12 bits ADC)
 
 #endif
diff --git a/StRoot/StEvent/StFwdTrack.cxx b/StRoot/StEvent/StFwdTrack.cxx
@@ -6,6 +6,11 @@ StFwdTrack::StFwdTrack() {
 
 }
 
+StFwdTrack::~StFwdTrack() { 
+   mEcalClusters.clear();
+   mHcalClusters.clear();
+}
+
 
 /* momentum
  * get the track momentum at the first point (PV if included)

diff --git a/StRoot/StEvent/StFwdTrack.h b/StRoot/StEvent/StFwdTrack.h
@@ -22,6 +22,7 @@
 #include <vector>
 #include "StThreeVectorD.hh"
 #include "StContainers.h"
+#include <climits>
 
 class StFcsCluster;
 
@@ -77,18 +78,21 @@ struct StFwdTrackProjection : public StObject {
 struct StFwdTrackSeedPoint : public StObject {
     StFwdTrackSeedPoint() {}
     StFwdTrackSeedPoint(    StThreeVectorD xyz, 
-                            short sec, 
+                            short detsec, 
                             unsigned short trackId, 
                             float cov[9] ){
         mXYZ = xyz;
-        mSector = sec;
+        mSector = detsec;
         mTrackId = trackId;
         memcpy( mCov, cov, sizeof( mCov ));
     }
+
+    short detectorId() const { return mSector / 10; }
+    short sector() const { return mSector % 10; }
 
     StThreeVectorD mXYZ;
     unsigned short mTrackId;
-    short mSector;
+    short mSector; // = detId * 10 + sector
     float mCov[9];
 
     ClassDef(StFwdTrackSeedPoint, 1)
@@ -98,6 +102,8 @@ class StFwdTrack : public StObject {
 
 public:
     StFwdTrack(  );
+    // dtor needed for releasing associations
+    ~StFwdTrack(  );
 
     vector<StFwdTrackProjection> mProjections;
     vector<StFwdTrackSeedPoint> mFTTPoints;
@@ -130,7 +136,9 @@ class StFwdTrack : public StObject {
     short   numberOfSeedPoints() const;
     UShort_t idTruth() const { return mIdTruth; }
     UShort_t qaTruth() const { return mQATruth; }
-
+    StThreeVectorD dca() const { return StThreeVectorD( mDCA[0], mDCA[1], mDCA[2] ); }
+    UChar_t vertexIndex() const { return mVtxIndex; }
+    bool isPrimary() const { return mVtxIndex != UCHAR_MAX; }
 
     void setPrimaryMomentum( StThreeVectorD mom ) { mPrimaryMomentum = mom; }
     void setDidFitConverge( bool lDidFitConverge ) { mDidFitConverge = lDidFitConverge; }
@@ -143,6 +151,9 @@ class StFwdTrack : public StObject {
     void setPval( float lPval ) { mPval = lPval;}
     void setCharge( short  lCharge ) { mCharge = lCharge;}
     void setMc( UShort_t idt, UShort_t qual ) { mIdTruth = idt; mQATruth = qual; }
+    void setDCA( StThreeVectorD dca ) { mDCA[0] = dca.x(); mDCA[1] = dca.y(); mDCA[2] = dca.z(); }
+    void setDCA( float dcaX, float dcaY, float dcaZ ) { mDCA[0] = dcaX; mDCA[1] = dcaY; mDCA[2] = dcaZ; }
+    void setVtxIndex( UChar_t vtxIndex ) { mVtxIndex = vtxIndex; }
 
     // ECAL clusters
     StPtrVecFcsCluster& ecalClusters();
@@ -177,8 +188,12 @@ class StFwdTrack : public StObject {
     UShort_t mIdTruth;
     /// MC track quality (percentage of hits coming from corresponding MC track)
     UShort_t mQATruth;
+
+    float mDCA[3]; // DCA to the primary vertex
+    UChar_t mVtxIndex;
 
-    ClassDef(StFwdTrack,3)
+
+    ClassDef(StFwdTrack,4)
 
 };
 

diff --git a/StRoot/StEvent/StFwdTrackCollection.cxx b/StRoot/StEvent/StFwdTrackCollection.cxx
@@ -15,6 +15,13 @@
 
 ClassImp(StFwdTrackCollection)
 
+StFwdTrackCollection::~StFwdTrackCollection(){
+	for (unsigned int i=0; i<mTracks.size(); i++) {
+       delete mTracks[i];
+       mTracks[i] = 0;
+   }
+}
+
 void StFwdTrackCollection::addTrack( StFwdTrack *track ) {
 	mTracks.push_back( track );
 }

diff --git a/StRoot/StEvent/StFwdTrackCollection.h b/StRoot/StEvent/StFwdTrackCollection.h
@@ -19,7 +19,7 @@ class StFwdTrack;
 class StFwdTrackCollection : public StObject {
 public:
     // StFwdTrackCollection();
-    // ~StFwdTrackCollection();
+    ~StFwdTrackCollection();
 
     void addTrack(StFwdTrack*);              // Add a track
     StSPtrVecFwdTrack& tracks();             // Return the track list

diff --git a/StRoot/StEvent/StVertex.h b/StRoot/StEvent/StVertex.h
@@ -128,13 +128,15 @@ class StVertex : public StMeasuredPoint {
     virtual void setKinkVertex()      {SETBIT(mFlag,kKinkVtxId);}    
     virtual void setBeamConstrained() {SETBIT(mFlag,kBEAMConstrVtxId);}
     virtual void setRejected()        {SETBIT(mFlag,kRejectedVtxId);}
+    virtual void setFwdVertex()       {SETBIT(mFlag,kFwdVtxId);}
 
     bool        isPrimaryVtx()      const {return TESTBIT(mFlag,kPrimaryVtxId);}
     bool        isV0Vtx()           const {return TESTBIT(mFlag,kV0VtxId);}
     bool        isXiVtx()           const {return TESTBIT(mFlag,kXiVtxId);}
     bool        isKinkVertex()      const {return TESTBIT(mFlag,kKinkVtxId);}
     bool        isBeamConstrained() const {return TESTBIT(mFlag,kBEAMConstrVtxId);}
     bool        isRejected()        const {return TESTBIT(mFlag,kRejectedVtxId);}
+    bool        isFwdVtx()          const {return TESTBIT(mFlag,kFwdVtxId);}
     void Print(Option_t *option="") const {cout << option << *this << endl; }
     static void   SetNoFitPointCutForGoodTrack(UInt_t val) {fgNoFitPointCutForGoodTrack = val;}
     static UInt_t NoFitPointCutForGoodTrack() {return fgNoFitPointCutForGoodTrack;}