Add configurableParam for TRD tracker

martenole · davidrohr · commit a6ba52d94aa5 · 2020-11-17T11:11:38.000+01:00
- GPURecSettings are sorted by parameter type size
- parameters are (if possible) directly accessed by the tracker without copying them
diff --git a/Detectors/TRD/workflow/src/TRDGlobalTrackingSpec.cxx b/Detectors/TRD/workflow/src/TRDGlobalTrackingSpec.cxx
@@ -52,40 +52,26 @@ void TRDGlobalTracking::init(InitContext& ic)
   mFlatGeo = std::make_unique<GeometryFlat>(*geo);
 
   //-------- init GPU reconstruction --------//
-  GPUSettingsEvent cfgEvent;
-  cfgEvent.solenoidBz = o2::base::Propagator::Instance()->getNominalBz();
-  GPUSettingsRec cfgRec;
-  cfgRec.NWaysOuter = 1;
-  GPUSettingsProcessing cfgDeviceProcessing;
-  cfgDeviceProcessing.debugLevel = -1; // -1 : silent
   GPURecoStepConfiguration cfgRecoStep;
   cfgRecoStep.steps = GPUDataTypes::RecoStep::NoRecoStep;
   cfgRecoStep.inputs.clear();
   cfgRecoStep.outputs.clear();
   mRec = GPUReconstruction::CreateInstance("CPU", true);
-  mRec->SetSettings(&cfgEvent, &cfgRec, &cfgDeviceProcessing, &cfgRecoStep);
+  mRec->SetSettings(o2::base::Propagator::Instance()->getNominalBz(), &cfgRecoStep);
 
   mChainTracking = mRec->AddChain<GPUChainTracking>();
 
   mTracker = new GPUTRDTracker();
-  mTracker->SetNCandidates(1); // must be set before initialization
+  mTracker->SetNCandidates(mRec->GetProcessingSettings().trdNCandidates); // must be set before initialization
   mTracker->SetProcessPerTimeFrame();
-  mTracker->SetNMaxCollisions(1000); // max number of collisions within a time frame which can be processed
+  mTracker->SetNMaxCollisions(mRec->GetProcessingSettings().trdNMaxCollisions);
 
   mRec->RegisterGPUProcessor(mTracker, false);
   mChainTracking->SetTRDGeometry(std::move(mFlatGeo));
   if (mRec->Init()) {
     LOG(FATAL) << "GPUReconstruction could not be initialized";
   }
 
-  // configure the tracker
-  // TODO: these settings will eventually be moved to GPUSettingsRec to be configurable via --configKeyValues
-  //mTracker->EnableDebugOutput();
-  //mTracker->StartDebugging();
-  mTracker->SetPtThreshold(0.5);
-  mTracker->SetChi2Threshold(15);
-  mTracker->SetChi2Penalty(12);
-  mTracker->SetStopTrkFollowingAfterNMissingLayers(6);
   mTracker->PrintSettings();
 
   mTimer.Stop();
diff --git a/GPU/GPUTracking/Base/GPUSettingsList.h b/GPU/GPUTracking/Base/GPUSettingsList.h
@@ -47,6 +47,9 @@ AddOptionRTC(TrackReferenceX, float, 1000.f, "", 0, "Transport all tracks to thi
 AddOptionRTC(tpcZSthreshold, float, 2.0f, "", 0, "Zero-Suppression threshold")
 AddOptionRTC(tpcTubeChi2, float, 5.f * 5.f, "", 0, "Max chi2 to mark cluster adjacent to track")
 AddOptionRTC(tpcTubeMaxSize2, float, 2.5f * 2.5f, "", 0, "Square of max tube size (normally derrived from tpcTubeChi2)")
+AddOptionRTC(trdMinTrackPt, float, .5f, "", 0, "Min Pt for tracks to be propagated through the TRD")
+AddOptionRTC(trdMaxChi2, float, 15.f, "", 0, "Max chi2 for TRD tracklets to be matched to a track")
+AddOptionRTC(trdPenaltyChi2, float, 12.f, "", 0, "Chi2 penalty for no available TRD tracklet (effective chi2 cut value)")
 AddOptionRTC(tpcCFqmaxCutoff, unsigned char, 3, "", 0, "Cluster Finder rejects cluster with qmax below this threshold")
 AddOptionRTC(tpcCFqtotCutoff, unsigned char, 0, "", 0, "Cluster Finder rejects cluster with qtot below this threshold")
 AddOptionRTC(tpcCFinnerThreshold, unsigned char, 0, "", 0, "Cluster Finder extends cluster if inner charge above this threshold")
@@ -78,6 +81,7 @@ AddOptionRTC(retryRefit, char, 1, "", 0, "Retry refit when fit fails")
 AddOptionRTC(loopInterpolationInExtraPass, char, -1, "", 0, "Perform loop interpolation in an extra pass")
 AddOptionRTC(mergerReadFromTrackerDirectly, char, 1, "", 0, "Forward data directly from tracker to merger on GPU")
 AddOptionRTC(useMatLUT, char, 0, "", 0, "Use material lookup table for TPC refit")
+AddOptionRTC(trdStopTrkAfterNMissLy, unsigned char, 6, "", 0, "Abandon track following after N layers without a TRD match")
 AddCustomCPP(void SetMinTrackPt(float v) { MaxTrackQPt = v > 0.001 ? (1. / v) : (1. / 0.001); })
 AddVariable(dummyRTC, float, 0.f) // Ensure non empty struct and proper alignment even if all normal members are constexpr
 AddHelp("help", 'h')
@@ -86,6 +90,8 @@ EndConfig()
 // Settings steering the processing once the device was selected
 BeginSubConfig(GPUSettingsProcessing, proc, configStandalone, "PROC", 0, "Processing settings")
 AddOption(platformNum, int, -1, "", 0, "Platform to use, in case the backend provides multiple platforms (-1 = auto-select)")
+AddOption(trdNCandidates, int, 1, "", 0, "Number of branching track candidates for single input track during propagation")
+AddOption(trdNMaxCollisions, int, 1000, "", 0, "Maximum number of collisions per TF which the TRD tracker can handle")
 AddOption(gpuDeviceOnly, bool, false, "", 0, "Use only GPU as device (i.e. no CPU for OpenCL)")
 AddOption(debugMask, int, -1, "", 0, "Mask for debug output dumps to file")
 AddOption(comparableDebutOutput, bool, true, "", 0, "Make CPU and GPU debug output comparable (sort / skip concurrent parts)")
diff --git a/GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx b/GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx
@@ -105,7 +105,7 @@ void* GPUTRDTracker_t<TRDTRK, PROP>::SetPointersTracks(void* base)
 }
 
 template <class TRDTRK, class PROP>
-GPUTRDTracker_t<TRDTRK, PROP>::GPUTRDTracker_t() : mR(nullptr), mIsInitialized(false), mProcessPerTimeFrame(false), mMemoryPermanent(-1), mMemoryTracklets(-1), mMemoryTracks(-1), mNMaxCollisions(1), mNMaxTracks(0), mNMaxSpacePoints(0), mTracks(nullptr), mNCandidates(1), mNCollisions(1), mNTracks(0), mNEvents(0), mTriggerRecordIndices(nullptr), mTriggerRecordTimes(nullptr), mTracklets(nullptr), mMaxThreads(100), mNTracklets(0), mTrackletIndexArray(nullptr), mHypothesis(nullptr), mCandidates(nullptr), mSpacePoints(nullptr), mTrackletLabels(nullptr), mGeo(nullptr), mRPhiA2(0), mRPhiB(0), mRPhiC2(0), mDyA2(0), mDyB(0), mDyC2(0), mAngleToDyA(0), mAngleToDyB(0), mAngleToDyC(0), mDebugOutput(false), mTimeWindow(.1f), mRadialOffset(-0.1), mMinPt(2.f), mMaxEta(0.84f), mExtraRoadY(2.f), mRoadZ(18.f), mMaxChi2(15.0f), mMaxMissingLy(6), mChi2Penalty(12.0f), mZCorrCoefNRC(1.4f), mMCEvent(nullptr), mDebug(new GPUTRDTrackerDebug<TRDTRK>())
+GPUTRDTracker_t<TRDTRK, PROP>::GPUTRDTracker_t() : mR(nullptr), mIsInitialized(false), mProcessPerTimeFrame(false), mMemoryPermanent(-1), mMemoryTracklets(-1), mMemoryTracks(-1), mNMaxCollisions(1), mNMaxTracks(0), mNMaxSpacePoints(0), mTracks(nullptr), mNCandidates(1), mNCollisions(1), mNTracks(0), mNEvents(0), mTriggerRecordIndices(nullptr), mTriggerRecordTimes(nullptr), mTracklets(nullptr), mMaxThreads(100), mNTracklets(0), mTrackletIndexArray(nullptr), mHypothesis(nullptr), mCandidates(nullptr), mSpacePoints(nullptr), mTrackletLabels(nullptr), mGeo(nullptr), mRPhiA2(0), mRPhiB(0), mRPhiC2(0), mDyA2(0), mDyB(0), mDyC2(0), mAngleToDyA(0), mAngleToDyB(0), mAngleToDyC(0), mDebugOutput(false), mTimeWindow(.1f), mRadialOffset(-0.1), mMaxEta(0.84f), mExtraRoadY(2.f), mRoadZ(18.f), mZCorrCoefNRC(1.4f), mMCEvent(nullptr), mDebug(new GPUTRDTrackerDebug<TRDTRK>())
 {
   //--------------------------------------------------------------------
   // Default constructor
@@ -299,8 +299,8 @@ void GPUTRDTracker_t<TRDTRK, PROP>::PrintSettings() const
   //--------------------------------------------------------------------
   GPUInfo("##############################################################");
   GPUInfo("Current settings for GPU TRD tracker:");
-  GPUInfo(" mMaxChi2(%.2f), mChi2Penalty(%.2f), nCandidates(%i), maxMissingLayers(%i)", mMaxChi2, mChi2Penalty, mNCandidates, mMaxMissingLy);
-  GPUInfo(" ptCut = %.2f GeV, abs(eta) < %.2f", mMinPt, mMaxEta);
+  GPUInfo(" maxChi2(%.2f), chi2Penalty(%.2f), nCandidates(%i), maxMissingLayers(%i)", Param().rec.trdMaxChi2, Param().rec.trdPenaltyChi2, mNCandidates, Param().rec.trdStopTrkAfterNMissLy);
+  GPUInfo(" ptCut = %.2f GeV, abs(eta) < %.2f", Param().rec.trdMinTrackPt, mMaxEta);
   GPUInfo("##############################################################");
 }
 
@@ -435,7 +435,7 @@ GPUd() bool GPUTRDTracker_t<TRDTRK, PROP>::CheckTrackTRDCandidate(const TRDTRK&
   if (CAMath::Abs(trk.getEta()) > mMaxEta) {
     return false;
   }
-  if (trk.getPt() < mMinPt) {
+  if (trk.getPt() < Param().rec.trdMinTrackPt) {
     return false;
   }
   return true;
@@ -778,16 +778,16 @@ GPUd() bool GPUTRDTracker_t<TRDTRK, PROP>::FollowProlongation(PROP* prop, TRDTRK
             RecalcTrkltCov(tilt, trkWork->getSnp(), pad->GetRowSize(mTracklets[trkltIdx].GetZbin()), trkltCovTmp);
             float chi2 = prop->getPredictedChi2(trkltPosTmpYZ, trkltCovTmp);
             // GPUInfo("layer %i: chi2 = %f", iLayer, chi2);
-            if (chi2 < mMaxChi2 && CAMath::Abs(GetAngularPull(mSpacePoints[trkltIdx].mDy, trkWork->getSnp())) < 4) {
+            if (chi2 < Param().rec.trdMaxChi2 && CAMath::Abs(GetAngularPull(mSpacePoints[trkltIdx].mDy, trkWork->getSnp())) < 4) {
               Hypothesis hypo(trkWork->GetNlayers(), iCandidate, trkltIdx, trkWork->GetChi2() + chi2);
               InsertHypothesis(hypo, nCurrHypothesis, hypothesisIdxOffset);
-            } // end tracklet chi2 < mMaxChi2
+            } // end tracklet chi2 < Param().rec.trdMaxChi2
           }   // end tracklet in window
         }     // tracklet loop
       }       // chamber loop
 
       // add no update to hypothesis list
-      Hypothesis hypoNoUpdate(trkWork->GetNlayers(), iCandidate, -1, trkWork->GetChi2() + mChi2Penalty);
+      Hypothesis hypoNoUpdate(trkWork->GetNlayers(), iCandidate, -1, trkWork->GetChi2() + Param().rec.trdPenaltyChi2);
       InsertHypothesis(hypoNoUpdate, nCurrHypothesis, hypothesisIdxOffset);
       isOK = true;
     } // end candidate loop
@@ -853,10 +853,10 @@ GPUd() bool GPUTRDTracker_t<TRDTRK, PROP>::FollowProlongation(PROP* prop, TRDTRK
       if (mHypothesis[iUpdate + hypothesisIdxOffset].mTrackletId == -1) {
         // no matching tracklet found
         if (trkWork->GetIsFindable(iLayer)) {
-          if (trkWork->GetNmissingConsecLayers(iLayer) > mMaxMissingLy) {
+          if (trkWork->GetNmissingConsecLayers(iLayer) > Param().rec.trdStopTrkAfterNMissLy) {
             trkWork->SetIsStopped();
           }
-          trkWork->SetChi2(trkWork->GetChi2() + mChi2Penalty);
+          trkWork->SetChi2(trkWork->GetChi2() + Param().rec.trdPenaltyChi2);
         }
         if (iUpdate == 0 && mNCandidates > 1) { // TODO: is thie really necessary????? CHECK!
           *t = mCandidates[2 * iUpdate + nextIdx];
@@ -876,9 +876,9 @@ GPUd() bool GPUTRDTracker_t<TRDTRK, PROP>::FollowProlongation(PROP* prop, TRDTRK
         if (ENABLE_WARNING) {
           Warning("FollowProlongation", "Final track propagation for track %i update %i in layer %i failed", iTrack, iUpdate, iLayer);
         }
-        trkWork->SetChi2(trkWork->GetChi2() + mChi2Penalty);
+        trkWork->SetChi2(trkWork->GetChi2() + Param().rec.trdPenaltyChi2);
         if (trkWork->GetIsFindable(iLayer)) {
-          if (trkWork->GetNmissingConsecLayers(iLayer) >= mMaxMissingLy) {
+          if (trkWork->GetNmissingConsecLayers(iLayer) >= Param().rec.trdStopTrkAfterNMissLy) {
             trkWork->SetIsStopped();
           }
         }
@@ -922,9 +922,9 @@ GPUd() bool GPUTRDTracker_t<TRDTRK, PROP>::FollowProlongation(PROP* prop, TRDTRK
         if (ENABLE_WARNING) {
           Warning("FollowProlongation", "Failed to update track %i with space point in layer %i", iTrack, iLayer);
         }
-        trkWork->SetChi2(trkWork->GetChi2() + mChi2Penalty);
+        trkWork->SetChi2(trkWork->GetChi2() + Param().rec.trdPenaltyChi2);
         if (trkWork->GetIsFindable(iLayer)) {
-          if (trkWork->GetNmissingConsecLayers(iLayer) >= mMaxMissingLy) {
+          if (trkWork->GetNmissingConsecLayers(iLayer) >= Param().rec.trdStopTrkAfterNMissLy) {
             trkWork->SetIsStopped();
           }
         }
diff --git a/GPU/GPUTracking/TRDTracking/GPUTRDTracker.h b/GPU/GPUTracking/TRDTracking/GPUTRDTracker.h
@@ -148,21 +148,13 @@ class GPUTRDTracker_t : public GPUProcessor
   GPUd() void SetProcessPerTimeFrame() { mProcessPerTimeFrame = true; }
   GPUd() void SetMCEvent(AliMCEvent* mc) { mMCEvent = mc; }
   GPUd() void EnableDebugOutput() { mDebugOutput = true; }
-  GPUd() void SetPtThreshold(float minPt) { mMinPt = minPt; }
   GPUd() void SetMaxEta(float maxEta) { mMaxEta = maxEta; }
-  GPUd() void SetChi2Threshold(float chi2) { mMaxChi2 = chi2; }
-  GPUd() void SetChi2Penalty(float chi2) { mChi2Penalty = chi2; }
-  GPUd() void SetStopTrkFollowingAfterNMissingLayers(int ly) { mMaxMissingLy = ly; }
   GPUd() void SetExtraRoadY(float extraRoadY) { mExtraRoadY = extraRoadY; }
   GPUd() void SetRoadZ(float roadZ) { mRoadZ = roadZ; }
 
   GPUd() AliMCEvent* GetMCEvent() const { return mMCEvent; }
   GPUd() bool GetIsDebugOutputOn() const { return mDebugOutput; }
-  GPUd() float GetPtThreshold() const { return mMinPt; }
   GPUd() float GetMaxEta() const { return mMaxEta; }
-  GPUd() float GetChi2Threshold() const { return mMaxChi2; }
-  GPUd() float GetChi2Penalty() const { return mChi2Penalty; }
-  GPUd() int GetMaxMissingLayers() const { return mMaxMissingLy; }
   GPUd() int GetNCandidates() const { return mNCandidates; }
   GPUd() float GetExtraRoadY() const { return mExtraRoadY; }
   GPUd() float GetRoadZ() const { return mRoadZ; }
@@ -215,13 +207,9 @@ class GPUTRDTracker_t : public GPUProcessor
   bool mDebugOutput;                       // store debug output
   float mTimeWindow;                       // max. deviation of the ITS-TPC track time w.r.t. TRD trigger record time stamp (in us, default is 100 ns)
   float mRadialOffset;                     // due to mis-calibration of t0
-  float mMinPt;                            // min pt of TPC tracks for tracking
   float mMaxEta;                           // TPC tracks with higher eta are ignored
   float mExtraRoadY;                       // addition to search road in r-phi to account for not exact radial match of tracklets and tracks in first iteration
   float mRoadZ;                            // in z, a constant search road is used
-  float mMaxChi2;                          // max chi2 for tracklets
-  int mMaxMissingLy;                       // max number of missing layers per track
-  float mChi2Penalty;                      // chi2 added to the track for no update
   float mZCorrCoefNRC;                     // tracklet z-position depends linearly on track dip angle
   AliMCEvent* mMCEvent;                    //! externaly supplied optional MC event
   GPUTRDTrackerDebug<TRDTRK>* mDebug;      // debug output
