@@ -95,7 +95,6 @@ struct nucleiFlowTree {
9595 Service<o2::ccdb::BasicCCDBManager> ccdb;
9696 Zorro zorro;
9797 OutputObj<ZorroSummary> zorroSummary{" zorroSummary" };
98- TrackTuner trackTunerObj;
9998
10099 Configurable<bool > cfgCompensatePIDinTracking{" cfgCompensatePIDinTracking" , false , " If true, divide tpcInnerParam by the electric charge" };
101100
@@ -120,19 +119,12 @@ struct nucleiFlowTree {
120119 Configurable<LabeledArray<double >> cfgDCAcut{" cfgDCAcut" , {nuclei::DCAcutDefault[0 ], 5 , 2 , nuclei::names, nuclei::nDCAConfigName}, " Max DCAxy and DCAz for light nuclei" };
121120 Configurable<LabeledArray<double >> cfgDownscaling{" cfgDownscaling" , {nuclei::DownscalingDefault[0 ], 5 , 1 , nuclei::names, nuclei::DownscalingConfigName}, " Fraction of kept candidates for light nuclei" };
122121 Configurable<LabeledArray<int >> cfgTreeConfig{" cfgTreeConfig" , {nuclei::TreeConfigDefault[0 ], 5 , 2 , nuclei::names, nuclei::treeConfigNames}, " Filtered trees configuration" };
123- Configurable<LabeledArray<int >> cfgDCAHists{" cfgDCAHists" , {nuclei::DCAHistDefault[0 ], 5 , 2 , nuclei::names, nuclei::DCAConfigNames}, " DCA hist configuration" }; // TODO: levare tutte le ricorrenzeå
124- Configurable<LabeledArray<int >> cfgFlowHist{" cfgFlowHist" , {nuclei::FlowHistDefault[0 ], 5 , 1 , nuclei::names, nuclei::flowConfigNames}, " Flow hist configuration" }; // TODO: levare tutte le ricorrenzeå
125122
126123 ConfigurableAxis cfgNITSClusBins{" cfgNITSClusBins" , {3 , 4.5 , 7.5 }, " N ITS clusters binning" };
127124 ConfigurableAxis cfgNTPCClusBins{" cfgNTPCClusBins" , {3 , 89.5 , 159.5 }, " N TPC clusters binning" };
128125
129126 Configurable<bool > cfgSkimmedProcessing{" cfgSkimmedProcessing" , false , " Skimmed dataset processing" };
130127
131- // configurables for track tuner
132- Configurable<bool > cfgUseTrackTuner{" cfgUseTrackTuner" , false , " Apply track tuner corrections to MC tracks" };
133- Configurable<std::string> cfgTrackTunerParams{" cfgTrackTunerParams" , " debugInfo=0|updateTrackDCAs=1|updateTrackCovMat=1|updateCurvature=0|updateCurvatureIU=0|updatePulls=1|isInputFileFromCCDB=1|pathInputFile=Users/m/mfaggin/test/inputsTrackTuner/pp2023/smoothHighPtMC|nameInputFile=trackTuner_DataLHC23fPass1_McLHC23k4b_run535085.root|pathFileQoverPt=Users/h/hsharma/qOverPtGraphs|nameFileQoverPt=D0sigma_Data_removal_itstps_MC_LHC22b1b.root|usePvRefitCorrections=0|qOverPtMC=-1.|qOverPtData=-1." , " TrackTuner parameter initialization (format: <name>=<value>|<name>=<value>)" };
134- // running variables for track tuner
135- o2::dataformats::DCA mDcaInfoCov ;
136128 o2::track::TrackParametrizationWithError<float > mTrackParCov ;
137129 o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrLUT;
138130
@@ -210,6 +202,9 @@ struct nucleiFlowTree {
210202 spectra.fill (HIST (" hEventSelections" ), nuclei::evSel::kIsEPtriggered + 1 );
211203 }
212204
205+ float centrality = getCentrality (collision);
206+ spectra.fill (HIST (" hCentrality" ), centrality);
207+
213208 return true ;
214209 }
215210
@@ -241,7 +236,7 @@ struct nucleiFlowTree {
241236 ccdb->setLocalObjectValidityChecking ();
242237 ccdb->setFatalWhenNull (false );
243238
244- spectra.add (" hEventSelections" , " hEventSelections" , {HistType::kTH1I , {{nuclei::evSel::kNevSels + 1 , -0 .5f , float (nuclei::evSel::kNevSels ) + 0 .5f }}});
239+ spectra.add (" hEventSelections" , " hEventSelections" , {HistType::kTH1D , {{nuclei::evSel::kNevSels + 1 , -0 .5f , float (nuclei::evSel::kNevSels ) + 0 .5f }}});
245240 spectra.get <TH1 >(HIST (" hEventSelections" ))->GetXaxis ()->SetBinLabel (1 , " all" );
246241 spectra.get <TH1 >(HIST (" hEventSelections" ))->GetXaxis ()->SetBinLabel (nuclei::evSel::kTVX + 2 , " TVX" );
247242 spectra.get <TH1 >(HIST (" hEventSelections" ))->GetXaxis ()->SetBinLabel (nuclei::evSel::kZvtx + 2 , " Zvtx" );
@@ -252,7 +247,9 @@ struct nucleiFlowTree {
252247 spectra.get <TH1 >(HIST (" hEventSelections" ))->GetXaxis ()->SetBinLabel (nuclei::evSel::kIsGoodITSLayersAll + 2 , " IsGoodITSLayersAll" );
253248 spectra.get <TH1 >(HIST (" hEventSelections" ))->GetXaxis ()->SetBinLabel (nuclei::evSel::kIsEPtriggered + 2 , " IsEPtriggered" );
254249
255- spectra.add (" hRecVtxZData" , " collision z position" , HistType::kTH1F , {{200 , -20 ., +20 ., " z position (cm)" }});
250+ spectra.add (" hCentrality" , " hCentrality" , {HistType::kTH1D , {100 , 0 ., 100 ., " Centrality (%)" }});
251+
252+ spectra.add (" hRecVtxZData" , " collision z position" , HistType::kTH1F , {{200 , -20 ., 20 ., " z position (cm)" }});
256253 spectra.add (" hTpcSignalData" , " Specific energy loss" , HistType::kTH2F , {{600 , -6 ., 6 ., " #it{p} (GeV/#it{c})" }, {1400 , 0 , 1400 , " d#it{E} / d#it{X} (a. u.)" }});
257254 spectra.add (" hTpcSignalDataSelected" , " Specific energy loss for selected particles" , HistType::kTH2F , {{600 , -6 ., 6 ., " #it{p} (GeV/#it{c})" }, {1400 , 0 , 1400 , " d#it{E} / d#it{X} (a. u.)" }});
258255 spectra.add (" hTofSignalData" , " TOF beta" , HistType::kTH2F , {{500 , 0 ., 5 ., " #it{p} (GeV/#it{c})" }, {750 , 0 , 1.5 , " TOF #beta" }});
@@ -300,8 +297,6 @@ struct nucleiFlowTree {
300297
301298 const o2::math_utils::Point3D<float > collVtx{collision.posX (), collision.posY (), collision.posZ ()};
302299
303- float centrality = getCentrality (collision);
304-
305300 const double bgScalings[5 ][2 ]{
306301 {nuclei::charges[0 ] * cfgMomentumScalingBetheBloch->get (0u , 0u ) / nuclei::masses[0 ], nuclei::charges[0 ] * cfgMomentumScalingBetheBloch->get (0u , 1u ) / nuclei::masses[0 ]},
307302 {nuclei::charges[1 ] * cfgMomentumScalingBetheBloch->get (1u , 0u ) / nuclei::masses[1 ], nuclei::charges[1 ] * cfgMomentumScalingBetheBloch->get (1u , 1u ) / nuclei::masses[1 ]},
@@ -325,9 +320,6 @@ struct nucleiFlowTree {
325320 float correctedTpcInnerParam = (heliumPID && cfgCompensatePIDinTracking) ? track.tpcInnerParam () / 2 : track.tpcInnerParam ();
326321
327322 spectra.fill (HIST (" hTpcSignalData" ), correctedTpcInnerParam * track.sign (), track.tpcSignal ());
328- float nSigma[2 ][5 ]{
329- {-10 ., -10 ., -10 ., -10 ., -10 .},
330- {0 .f , 0 .f , 0 .f , 0 .f , 0 .f }}; // / then we will calibrate the TOF mass for the He3 and Alpha
331323 const int iC{track.sign () < 0 };
332324
333325 bool selectedTPC[5 ]{false }, goodToAnalyse{false };
@@ -349,7 +341,6 @@ struct nucleiFlowTree {
349341 continue ;
350342 }
351343
352- mDcaInfoCov .set (999 , 999 , 999 , 999 , 999 );
353344 setTrackParCov (track, mTrackParCov );
354345 mTrackParCov .setPID (track.pidForTracking ());
355346
@@ -383,7 +374,6 @@ struct nucleiFlowTree {
383374 continue ;
384375 }
385376 ROOT ::Math::LorentzVector<ROOT ::Math::PtEtaPhiM4D<float >> fvector{mTrackParCov .getPt () * nuclei::charges[iS], mTrackParCov .getEta (), mTrackParCov .getPhi (), nuclei::masses[iS]};
386- float y{fvector.Rapidity () + cfgCMrapidity};
387377 if (selectedTPC[iS]) {
388378 if (track.hasTOF ()) {
389379 selectedTOF = true ; // / temporarly skipped
@@ -393,8 +383,7 @@ struct nucleiFlowTree {
393383 if (cfgTreeConfig->get (iS, 1u ) && !selectedTOF) {
394384 continue ;
395385 }
396- // !fillDCAHist && cfgDCAHists->get(iS, iC) ? fillDCAHist = true : fillDCAHist;
397- bool setPartFlag = cfgTreeConfig->get (iS, 0u ) || cfgDCAHists->get (iS, iC);
386+ bool setPartFlag = cfgTreeConfig->get (iS, 0u );
398387 if (setPartFlag) {
399388 if (cfgDownscaling->get (iS) < 1 . && gRandom ->Rndm () > cfgDownscaling->get (iS)) {
400389 continue ;
@@ -470,7 +459,7 @@ struct nucleiFlowTree {
470459 nucleiTableFlow (c.centFV0A , c.centFT0M , c.centFT0A , c.centFT0C , c.psiFT0A , c.psiFT0C , c.psiTPC , c.psiTPCl , c.psiTPCr , c.qFT0A , c.qFT0C , c.qTPC , c.qTPCl , c.qTPCr );
471460 }
472461 }
473- PROCESS_SWITCH (nucleiFlowTree, processDataFlow, " Data analysis with flow" , false );
462+ PROCESS_SWITCH (nucleiFlowTree, processDataFlow, " Data analysis with flow" , true );
474463
475464 void processDataFlowAlternative (CollWithQvec const & collision, TrackCandidates const & tracks, aod::BCsWithTimestamps const &)
476465 {
0 commit comments