@@ -100,15 +100,15 @@ struct HfTrackIndexSkimCreatorTagSelCollisions {
100100 Configurable<float > zVertexMax{" zVertexMax" , 100 ., " max. z of primary vertex [cm]" };
101101 Configurable<int > nContribMin{" nContribMin" , 0 , " min. number of contributors to primary-vertex reconstruction" };
102102 Configurable<float > chi2Max{" chi2Max" , 0 ., " max. chi^2 of primary-vertex reconstruction" };
103- Configurable<std::string> triggerClassName{" triggerClassName" , " kINT7" , " trigger class" };
103+ Configurable<std::string> triggerClassName{" triggerClassName" , " kINT7" , " Run 2 trigger class, only for Run 2 converted data " };
104104 Configurable<bool > useSel8Trigger{" useSel8Trigger" , true , " use sel8 trigger condition, for Run3 studies" };
105105 Configurable<float > centralityMin{" centralityMin" , 0 ., " Minimum centrality" };
106106 Configurable<float > centralityMax{" centralityMax" , 100 ., " Maximum centrality" };
107107 Configurable<bool > useTimeFrameBorderCut{" useTimeFrameBorderCut" , true , " use time-frame border cut in event selection" };
108108
109109 ConfigurableAxis axisNumContributors{" axisNumContributors" , {200 , -0 .5f , 199 .5f }, " Number of PV contributors" };
110110
111- int triggerClass;
111+ int triggerClassRun2 = - 1 ; // numerical value of the trigger class for Run2
112112
113113 // QA histos
114114 std::shared_ptr<TH1> hEvents, hPrimVtxZBeforeSel, hPrimVtxZAfterSel, hPrimVtxXAfterSel, hPrimVtxYAfterSel, hNContributorsAfterSel;
@@ -121,7 +121,10 @@ struct HfTrackIndexSkimCreatorTagSelCollisions {
121121 LOGP (fatal, " One and only one process function for collision selection can be enabled at a time!" );
122122 }
123123
124- triggerClass = std::distance (aliasLabels, std::find (aliasLabels, aliasLabels + kNaliases , triggerClassName.value .data ()));
124+ auto triggerAlias = std::find (aliasLabels, aliasLabels + kNaliases , triggerClassName.value .data ());
125+ if (triggerAlias != aliasLabels + kNaliases ) {
126+ triggerClassRun2 = std::distance (aliasLabels, triggerAlias);
127+ }
125128
126129 if (fillHistograms) {
127130 hEvents = registry.add <TH1>(" hEvents" , " Events;;entries" , HistType::kTH1F , {axisEvents});
@@ -148,7 +151,7 @@ struct HfTrackIndexSkimCreatorTagSelCollisions {
148151 void selectCollision (const Col& collision)
149152 {
150153 float centrality = -1 .;
151- const auto statusCollision = getHfCollisionRejectionMask<applyTrigSel, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, triggerClass , useTimeFrameBorderCut, zVertexMin, zVertexMax, nContribMin, chi2Max);
154+ const auto statusCollision = getHfCollisionRejectionMask<applyTrigSel, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, triggerClassRun2 , useTimeFrameBorderCut, zVertexMin, zVertexMax, nContribMin, chi2Max);
152155
153156 if (fillHistograms) {
154157 monitorCollision (collision, statusCollision, hEvents, hPrimVtxZBeforeSel, hPrimVtxZAfterSel, hPrimVtxXAfterSel, hPrimVtxYAfterSel, hNContributorsAfterSel);
0 commit comments