@@ -591,13 +591,15 @@ struct FlowSP {
591591 if (cfg.correctionsLoaded )
592592 return ;
593593
594+ int nWeights = 3 ;
595+
594596 if (cfgNUA.value .empty () == false ) {
595597 TList* listCorrections = ccdb->getForTimeStamp <TList>(cfgNUA, timestamp);
596598 cfg.mAcceptance .push_back (reinterpret_cast <GFWWeights*>(listCorrections->FindObject (" weights" )));
597599 cfg.mAcceptance .push_back (reinterpret_cast <GFWWeights*>(listCorrections->FindObject (" weights_positive" )));
598600 cfg.mAcceptance .push_back (reinterpret_cast <GFWWeights*>(listCorrections->FindObject (" weights_negative" )));
599601 int sizeAcc = cfg.mAcceptance .size ();
600- if (sizeAcc < 3 )
602+ if (sizeAcc < nWeights) {
601603 LOGF (warning, " Could not load acceptance weights from %s" , cfgNUA.value .c_str ());
602604 else
603605 LOGF (info, " Loaded acceptance weights from %s" , cfgNUA.value .c_str ());
@@ -610,7 +612,7 @@ struct FlowSP {
610612 cfg.mEfficiency .push_back (reinterpret_cast <TH1D*>(listCorrections->FindObject (" Efficiency_pos" )));
611613 cfg.mEfficiency .push_back (reinterpret_cast <TH1D*>(listCorrections->FindObject (" Efficiency_neg" )));
612614 int sizeEff = cfg.mEfficiency .size ();
613- if (sizeEff < 3 ) {
615+ if (sizeEff < nWeights ) {
614616 LOGF (fatal, " Could not load efficiency histogram for trigger particles from %s" , cfgNUE.value .c_str ());
615617 }
616618 LOGF (info, " Loaded efficiency histogram from %s" , cfgNUE.value .c_str ());
@@ -1180,6 +1182,11 @@ struct FlowSP {
11801182 if (track.sign () == 0.0 )
11811183 continue ;
11821184 registry.fill (HIST (" hTrackCount" ), trackSel_ZeroCharge);
1185+ <<<<<<< Updated upstream
1186+
1187+ bool pos = (track.sign () > 0 ) ? true : false ;
1188+ =======
1189+ >>>>>>> Stashed changes
11831190
11841191 fillMCPtHistos<kBefore , kReco >(track, mcParticle.pdgCode ());
11851192
0 commit comments