add mcCollHistIsObsolete global parameter to allow running GetNEventsSelected_JetFramework_gen with previous histogram version before change to O2Physics

aimeric-landou · aimeric-landou · commit 39cc315f6c2c · 2025-11-13T17:39:56.000Z
diff --git a/Utilities/AnalysisUtilities.C b/Utilities/AnalysisUtilities.C
@@ -53,10 +53,11 @@ double GetNEventsSelected_JetFramework_weighted(TFile* file_O2Analysis, const ch
 }
 
 long int GetNEventsSelected_JetFramework_gen(TFile* file_O2Analysis, const char analysisWorkflow[]) {
-  return ((TH1I*)file_O2Analysis->Get((TString)analysisWorkflow+"/h_mcColl_counts"))->GetBinContent(6);
+  int ibinFinalSelection = mcCollHistIsObsolete ? 4 : 6;
+  return ((TH1I*)file_O2Analysis->Get((TString)analysisWorkflow+"/h_mcColl_counts"))->GetBinContent(ibinFinalSelection);
 }
 double GetNEventsSelected_JetFramework_gen_weighted(TFile* file_O2Analysis, const char analysisWorkflow[]) {
-  int ibinFinalSelection = mcCollHistIsObsolete ? 3 : 6;
+  int ibinFinalSelection = mcCollHistIsObsolete ? 4 : 6;
   return ((TH1F*)file_O2Analysis->Get((TString)analysisWorkflow+"/h_mcColl_counts_weight"))->GetBinContent(ibinFinalSelection);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,11 @@ double GetNEventsSelected_JetFramework_weighted(TFile* file_O2Analysis, const ch`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`long int GetNEventsSelected_JetFramework_gen(TFile* file_O2Analysis, const char analysisWorkflow[]) {`
`56`		`- return ((TH1I*)file_O2Analysis->Get((TString)analysisWorkflow+"/h_mcColl_counts"))->GetBinContent(6);`
	`56`	`+ int ibinFinalSelection = mcCollHistIsObsolete ? 4 : 6;`
	`57`	`+ return ((TH1I*)file_O2Analysis->Get((TString)analysisWorkflow+"/h_mcColl_counts"))->GetBinContent(ibinFinalSelection);`
`57`	`58`	`}`
`58`	`59`	`double GetNEventsSelected_JetFramework_gen_weighted(TFile* file_O2Analysis, const char analysisWorkflow[]) {`
`59`		`- int ibinFinalSelection = mcCollHistIsObsolete ? 3 : 6;`
	`60`	`+ int ibinFinalSelection = mcCollHistIsObsolete ? 4 : 6;`
`60`	`61`	`return ((TH1F*)file_O2Analysis->Get((TString)analysisWorkflow+"/h_mcColl_counts_weight"))->GetBinContent(ibinFinalSelection);`
`61`	`62`	`}`
`62`	`63`