Skip to content

Commit cd17213

Browse files
aimeric-landouaimeric-landou
committed
JetSpectrum: implement weighted analysis for controlMC=false option
1 parent 59f1799 commit cd17213

File tree

2 files changed

+46
-22
lines changed

2 files changed

+46
-22
lines changed

‎Jets/JetSpectrum_SpectraGetters.C‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -450,11 +450,15 @@ void Get_Pt_spectrum_bkgCorrected_recBinning_preWidthScalingAtEnd(TH1D* &H1D_jet
450450

451451

452452
if (normaliseDistribsBeforeUnfolding) {
453-
if (!controlMC) {
454-
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
455-
} else {
456-
if (mcIsWeighted) {
453+
if (mcIsWeighted) {
454+
if (!controlMC) {
455+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_weighted(file_O2Analysis_list[iDataset], analysisWorkflowData));
456+
} else {
457457
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
458+
}
459+
} else {
460+
if (!controlMC) {
461+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
458462
} else {
459463
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
460464
}
@@ -475,11 +479,15 @@ void Get_Pt_spectrum_bkgCorrected_genBinning_preWidthScalingAtEnd(TH1D* &H1D_jet
475479

476480

477481
if (normaliseDistribsBeforeUnfolding) {
478-
if (!controlMC) {
479-
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
480-
} else {
481-
if (mcIsWeighted) {
482+
if (mcIsWeighted) {
483+
if (!controlMC) {
484+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
485+
} else {
482486
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
487+
}
488+
} else {
489+
if (!controlMC) {
490+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
483491
} else {
484492
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
485493
}
@@ -501,11 +509,15 @@ void Get_Pt_spectrum_bkgCorrected_fineBinning_preWidthScalingAtEnd(TH1D* &H1D_je
501509
Get_Pt_spectrum_bkgCorrected_fineBinning_preWidthScalingAtEndAndEvtNorm(H1D_jetPt, iDataset, iRadius, options);
502510

503511
if (normaliseDistribsBeforeUnfolding) {
504-
if (!controlMC) {
505-
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
506-
} else {
507-
if (mcIsWeighted) {
512+
if (mcIsWeighted) {
513+
if (!controlMC) {
514+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
515+
} else {
508516
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
517+
}
518+
} else {
519+
if (!controlMC) {
520+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
509521
} else {
510522
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
511523
}

‎Jets/JetSpectrum_Unfolding.C‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,12 @@ std::pair<int, RooUnfold*> Get_Pt_spectrum_unfolded_preWidthScalingAtEnd(TH1D* &
363363
cout << "Get_Pt_spectrum_unfolded_preWidthScalingAtEnd test 1" << endl;
364364
if (normaliseDistribsAfterUnfolding){
365365
if (!controlMC && options.find("inputIsMC") == std::string::npos) { // if option controlMC is false, and if inputIsMC has not been found in options; necessary check for the mcp-folded unfolding test as we want to normalise by the number of events in the MC file
366-
NormaliseRawHistToNEvents(H1D_jetPt_unfolded, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
367-
} else {
366+
if (mcIsWeighted) {
367+
NormaliseRawHistToNEvents(H1D_jetPt_unfolded, GetNEventsSelected_JetFramework_weighted(file_O2Analysis_list[iDataset], analysisWorkflowData));
368+
} else {
369+
NormaliseRawHistToNEvents(H1D_jetPt_unfolded, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
370+
}
371+
} else {
368372
if (mcIsWeighted) {
369373
NormaliseRawHistToNEvents(H1D_jetPt_unfolded, GetNEventsSelected_JetFramework_weighted(file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
370374
} else {
@@ -565,11 +569,15 @@ void Get_Pt_spectrum_dataUnfoldedThenRefolded_preWidthScalingAtEnd(TH1D* &H1D_je
565569
Get_Pt_spectrum_dataUnfoldedThenRefolded_preWidthScalingAtEndAndEvtNorm(H1D_jetPt_unfoldedThenRefolded, measuredInput, iDataset, iRadius, unfoldParameterInput, options);
566570

567571
if (normaliseDistribsAfterUnfolding){
568-
if (!controlMC) {
569-
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
570-
} else {
571-
if (mcIsWeighted) {
572+
if (mcIsWeighted) {
573+
if (!controlMC) {
574+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_weighted(file_O2Analysis_list[iDataset], analysisWorkflowData));
575+
} else {
572576
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
577+
}
578+
} else {
579+
if (!controlMC) {
580+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
573581
} else {
574582
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
575583
}
@@ -685,11 +693,15 @@ void Get_Pt_spectrum_dataUnfoldedThenRefolded_RooUnfoldMethod_preWidthScalingAtE
685693
Get_Pt_spectrum_dataUnfoldedThenRefolded_RooUnfoldMethod_preWidthScalingAtEndAndEvtNorm(H1D_jetPt_unfoldedThenRefolded, measuredInput, iDataset, iRadius, unfoldParameterInput, options);
686694

687695
if (normaliseDistribsAfterUnfolding){
688-
if (!controlMC) {
689-
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
690-
} else {
691-
if (mcIsWeighted) {
696+
if (mcIsWeighted) {
697+
if (!controlMC) {
698+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_weighted(file_O2Analysis_list[iDataset], analysisWorkflowData));
699+
} else {
692700
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
701+
}
702+
} else {
703+
if (!controlMC) {
704+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
693705
} else {
694706
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
695707
}

0 commit comments

Comments
 (0)