@@ -108,7 +108,7 @@ enum BeforeAfter {
108108};
109109
110110static const std::vector<std::string> beforeAfterName = {" before" , " before outliers exclusion" , " " };
111- static const std::vector<std::string> beforeAfterSufix = {" B" , " BO" , " A" };
111+ static const std::vector<std::string> beforeAfterSuffix = {" B" , " BO" , " A" };
112112
113113/* helpers for the multiplicity axes definition */
114114static constexpr float MultiplicityUpperLimitBase[11 ][8 ] = {
@@ -538,9 +538,10 @@ struct DptDptFilter {
538538 struct : ConfigurableGroup {
539539 std::string prefix = " cfgCCDB" ;
540540 Configurable<std::string> url{" url" , " http://ccdb-test.cern.ch:8080" , " The CCDB url for the input file" };
541- Configurable<std::string> pathName{" pathName" , " " , " The CCDB path for the input file. Default \"\" , i.e. don't load from CCDB" };
541+ Configurable<std::string> pathNameCorrections{" pathNameCorrections" , " " , " The CCDB path for the corrections file. Default \"\" , i.e. don't load from CCDB" };
542+ Configurable<std::string> pathNamePID{" pathNamePID" , " " , " The CCDB path for the PID adjusts file. Default \"\" , i.e. don't load from CCDB" };
542543 Configurable<std::string> date{" date" , " 20220307" , " The CCDB date for the input file" };
543- Configurable<std::string> period{ " period " , " LHC22o " , " The CCDB dataset period for the input file " };
544+ Configurable<std::string> suffix{ " suffix " , " " , " Dataset period suffix for metadata discrimination " };
544545 } cfginputfile;
545546 Configurable<bool > cfgFullDerivedData{" cfgFullDerivedData" , false , " Produce the full derived data for external storage. Default false" };
546547 Configurable<std::string> cfgCentMultEstimator{" cfgCentMultEstimator" , " V0M" , " Centrality/multiplicity estimator detector: V0M,CL0,CL1,FV0A,FT0M,FT0A,FT0C,NTPV,NOCM: none. Default V0M" };
@@ -683,23 +684,23 @@ struct DptDptFilter {
683684 if (cfgEventSelection.fillQc ) {
684685 /* the quality control histograms */
685686 for (int i = 0 ; i < BeforeAfterNOOFTIMES; ++i) {
686- fhMultiplicityVsCentrality[i] = new TH2F (TString::Format (" MultiplicityVsCentrality%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);Global tracks" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTMULTIPLICITYAXIS (MultSourceNtracks));
687- fhMultiplicityVsT0cMultiplicity[i] = new TH2F (TString::Format (" MultiplicityVsT0cMultiplicity%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;T0C Multiplicity;Global tracks" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0C), DPTDPTMULTIPLICITYAXIS (MultSourceNtracks));
688- fhMultiplicityVsT0aMultiplicity[i] = new TH2F (TString::Format (" MultiplicityVsT0aMultiplicity%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;T0A Multiplicity;Global tracks" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0A), DPTDPTMULTIPLICITYAXIS (MultSourceNtracks));
689- fhMultiplicityVsV0aMultiplicity[i] = new TH2F (TString::Format (" MultiplicityVsV0aMultiplicity%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;V0A Multiplicity;Global tracks" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceV0A), DPTDPTMULTIPLICITYAXIS (MultSourceNtracks));
690- fhMultiplicityVsPvMultiplicity[i] = new TH2F (TString::Format (" MultiplicityVsPvMultiplicity%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;PV contributors;Global tracks" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourcePvContributors), DPTDPTMULTIPLICITYAXIS (MultSourceNtracks));
691- fhPvMultiplicityVsCentrality[i] = new TH2F (TString::Format (" PvMultiplicityVsCentrality%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);PV contributors" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTMULTIPLICITYAXIS (MultSourcePvContributors));
692- fhPvMultiplicityVsT0cMultiplicity[i] = new TH2F (TString::Format (" PvMultiplicityVsT0cMultiplicity%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;T0C multiplicity;PV contributors" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0C), DPTDPTMULTIPLICITYAXIS (MultSourcePvContributors));
693- fhPvMultiplicityVsT0aMultiplicity[i] = new TH2F (TString::Format (" PvMultiplicityVsT0aMultiplicity%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;T0A multiplicity;PV contributors" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0A), DPTDPTMULTIPLICITYAXIS (MultSourcePvContributors));
694- fhPvMultiplicityVsV0aMultiplicity[i] = new TH2F (TString::Format (" PvMultiplicityVsV0aMultiplicity%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;V0A multiplicity;PV contributors" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceV0A), DPTDPTMULTIPLICITYAXIS (MultSourcePvContributors));
695- fhV0aMultiplicityVsCentrality[i] = new TH2F (TString::Format (" V0aMultiplicityVsCentrality%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);V0A multiplicity" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTMULTIPLICITYAXIS (MultSourceV0A));
696- fhV0aMultiplicityVsT0cMultiplicity[i] = new TH2F (TString::Format (" V0aMultiplicityVsT0cMultiplicity%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;T0C multiplicity;V0A multiplicity" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0C), DPTDPTMULTIPLICITYAXIS (MultSourceV0A));
697- fhV0aMultiplicityVsT0aMultiplicity[i] = new TH2F (TString::Format (" V0aMultiplicityVsT0aMultiplicity%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;T0A multiplicity;V0A multiplicity" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0A), DPTDPTMULTIPLICITYAXIS (MultSourceV0A));
698- fhT0cMultiplicityVsCentrality[i] = new TH2F (TString::Format (" T0cMultiplicityVsCentrality%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);T0C multiplicity" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTMULTIPLICITYAXIS (MultSourceT0C));
699- fhT0cMultiplicityVsT0aMultiplicity[i] = new TH2F (TString::Format (" T0cMultiplicityVsT0aMultiplicity%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;T0A multiplicity;T0C multiplicity" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0A), DPTDPTMULTIPLICITYAXIS (MultSourceT0C));
700- fhT0CentralityVsCentrality[i] = new TH2F (TString::Format (" T0CentralityVsCentrality%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);T0 centrality(%%)" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTCENTRALITYAXIS);
701- fhV0aCentralityVsCentrality[i] = new TH2F (TString::Format (" V0aCentralityVsCentrality%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);V0A centrality (%%)" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTCENTRALITYAXIS);
702- fhNtpvCentralityVsCentrality[i] = new TH2F (TString::Format (" NtpvCentralityVsCentrality%s" , beforeAfterSufix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);NTPV centrality (%%)" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTCENTRALITYAXIS);
687+ fhMultiplicityVsCentrality[i] = new TH2F (TString::Format (" MultiplicityVsCentrality%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);Global tracks" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTMULTIPLICITYAXIS (MultSourceNtracks));
688+ fhMultiplicityVsT0cMultiplicity[i] = new TH2F (TString::Format (" MultiplicityVsT0cMultiplicity%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;T0C Multiplicity;Global tracks" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0C), DPTDPTMULTIPLICITYAXIS (MultSourceNtracks));
689+ fhMultiplicityVsT0aMultiplicity[i] = new TH2F (TString::Format (" MultiplicityVsT0aMultiplicity%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;T0A Multiplicity;Global tracks" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0A), DPTDPTMULTIPLICITYAXIS (MultSourceNtracks));
690+ fhMultiplicityVsV0aMultiplicity[i] = new TH2F (TString::Format (" MultiplicityVsV0aMultiplicity%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;V0A Multiplicity;Global tracks" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceV0A), DPTDPTMULTIPLICITYAXIS (MultSourceNtracks));
691+ fhMultiplicityVsPvMultiplicity[i] = new TH2F (TString::Format (" MultiplicityVsPvMultiplicity%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;PV contributors;Global tracks" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourcePvContributors), DPTDPTMULTIPLICITYAXIS (MultSourceNtracks));
692+ fhPvMultiplicityVsCentrality[i] = new TH2F (TString::Format (" PvMultiplicityVsCentrality%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);PV contributors" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTMULTIPLICITYAXIS (MultSourcePvContributors));
693+ fhPvMultiplicityVsT0cMultiplicity[i] = new TH2F (TString::Format (" PvMultiplicityVsT0cMultiplicity%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;T0C multiplicity;PV contributors" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0C), DPTDPTMULTIPLICITYAXIS (MultSourcePvContributors));
694+ fhPvMultiplicityVsT0aMultiplicity[i] = new TH2F (TString::Format (" PvMultiplicityVsT0aMultiplicity%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;T0A multiplicity;PV contributors" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0A), DPTDPTMULTIPLICITYAXIS (MultSourcePvContributors));
695+ fhPvMultiplicityVsV0aMultiplicity[i] = new TH2F (TString::Format (" PvMultiplicityVsV0aMultiplicity%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;V0A multiplicity;PV contributors" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceV0A), DPTDPTMULTIPLICITYAXIS (MultSourcePvContributors));
696+ fhV0aMultiplicityVsCentrality[i] = new TH2F (TString::Format (" V0aMultiplicityVsCentrality%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);V0A multiplicity" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTMULTIPLICITYAXIS (MultSourceV0A));
697+ fhV0aMultiplicityVsT0cMultiplicity[i] = new TH2F (TString::Format (" V0aMultiplicityVsT0cMultiplicity%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;T0C multiplicity;V0A multiplicity" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0C), DPTDPTMULTIPLICITYAXIS (MultSourceV0A));
698+ fhV0aMultiplicityVsT0aMultiplicity[i] = new TH2F (TString::Format (" V0aMultiplicityVsT0aMultiplicity%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;T0A multiplicity;V0A multiplicity" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0A), DPTDPTMULTIPLICITYAXIS (MultSourceV0A));
699+ fhT0cMultiplicityVsCentrality[i] = new TH2F (TString::Format (" T0cMultiplicityVsCentrality%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);T0C multiplicity" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTMULTIPLICITYAXIS (MultSourceT0C));
700+ fhT0cMultiplicityVsT0aMultiplicity[i] = new TH2F (TString::Format (" T0cMultiplicityVsT0aMultiplicity%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;T0A multiplicity;T0C multiplicity" , beforeAfterName[i].c_str ()).Data (), DPTDPTMULTIPLICITYAXIS (MultSourceT0A), DPTDPTMULTIPLICITYAXIS (MultSourceT0C));
701+ fhT0CentralityVsCentrality[i] = new TH2F (TString::Format (" T0CentralityVsCentrality%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);T0 centrality(%%)" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTCENTRALITYAXIS);
702+ fhV0aCentralityVsCentrality[i] = new TH2F (TString::Format (" V0aCentralityVsCentrality%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);V0A centrality (%%)" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTCENTRALITYAXIS);
703+ fhNtpvCentralityVsCentrality[i] = new TH2F (TString::Format (" NtpvCentralityVsCentrality%s" , beforeAfterSuffix [i].c_str ()).Data (), TString::Format (" %s;%s centrality (%%);NTPV centrality (%%)" , beforeAfterName[i].c_str (), multestimator.data ()).Data (), DPTDPTCENTRALITYAXIS, DPTDPTCENTRALITYAXIS);
703704 }
704705 }
705706
@@ -1099,9 +1100,8 @@ struct DptDptFilterTracks {
10991100 bool storedccdbinfo = false ;
11001101
11011102 std::string cfgCCDBUrl{" http://ccdb-test.cern.ch:8080" };
1102- std::string cfgCCDBPathName {" " };
1103+ std::string cfgCCDBPathNamePID {" " };
11031104 std::string cfgCCDBDate{" 20220307" };
1104- std::string cfgCCDBPeriod{" LHC22o" };
11051105
11061106 Configurable<bool > cfgOutDebugInfo{" cfgOutDebugInfo" , false , " Out detailed debug information per track into a text file. Default false" };
11071107 Configurable<bool > cfgFullDerivedData{" cfgFullDerivedData" , false , " Produce the full derived data for external storage. Default false" };
@@ -1171,9 +1171,8 @@ struct DptDptFilterTracks {
11711171 }
11721172 /* self configure the CCDB access to the input file */
11731173 getTaskOptionValue (initContext, " dpt-dpt-filter" , " cfgCCDB.url" , cfgCCDBUrl, false );
1174- getTaskOptionValue (initContext, " dpt-dpt-filter" , " cfgCCDB.pathName " , cfgCCDBPathName , false );
1174+ getTaskOptionValue (initContext, " dpt-dpt-filter" , " cfgCCDB.pathNamePID " , cfgCCDBPathNamePID , false );
11751175 getTaskOptionValue (initContext, " dpt-dpt-filter" , " cfgCCDB.date" , cfgCCDBDate, false );
1176- getTaskOptionValue (initContext, " dpt-dpt-filter" , " cfgCCDB.period" , cfgCCDBPeriod, false );
11771176
11781177 /* create the output list which will own the task histograms */
11791178 TList* fOutputList = new TList ();
@@ -1440,9 +1439,9 @@ struct DptDptFilterTracks {
14401439 using namespace analysis ::dptdptfilter;
14411440
14421441 /* let's get a potential PID adjustment */
1443- if (cfgCCDBPathName .length () > 0 && !storedccdbinfo) {
1444- LOGF (info, " Getting information for PID adjustment from %s, at %s, for %s " , cfgCCDBPathName .c_str (), cfgCCDBDate. c_str (), cfgCCDBPeriod .c_str ());
1445- TList* pidinfo = getCCDBInput (ccdb, cfgCCDBPathName .c_str (), cfgCCDBDate. c_str (), cfgCCDBPeriod .c_str ());
1442+ if ((cfgCCDBDate .length () > 0 ) && (cfgCCDBPathNamePID. length () > 0 ) && !storedccdbinfo) {
1443+ LOGF (info, " Getting information for PID adjustment from %s, at %s" , cfgCCDBPathNamePID .c_str (), cfgCCDBDate.c_str ());
1444+ TList* pidinfo = getCCDBInput (ccdb, cfgCCDBPathNamePID .c_str (), cfgCCDBDate.c_str ());
14461445 if (pidinfo != nullptr ) {
14471446 pidselector.storePIDAdjustments (pidinfo);
14481447 }
0 commit comments