Skip to content

Commit 156ad3d

Browse files
aimeric-landouaimeric-landou
committed
add debug variable controlMC_useMcpCollCountForNorm
1 parent 3c358b2 commit 156ad3d

File tree

3 files changed

+64
-14
lines changed

3 files changed

+64
-14
lines changed

‎Jets/JetSpectrum_SpectraGetters.C‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -452,11 +452,19 @@ void Get_Pt_spectrum_bkgCorrected_recBinning_preWidthScalingAtEnd(TH1D* &H1D_jet
452452
if (normaliseDistribsBeforeUnfolding) {
453453
if (!controlMC) {
454454
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
455-
} else {
455+
} else {
456456
if (mcIsWeighted) {
457-
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
457+
if (!controlMC_useMcpCollCountForNorm) {
458+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
459+
} else {
460+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_gen_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
461+
}
458462
} else {
459-
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
463+
if (!controlMC_useMcpCollCountForNorm) {
464+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
465+
} else {
466+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_gen( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
467+
}
460468
}
461469
}
462470
}
@@ -479,9 +487,17 @@ void Get_Pt_spectrum_bkgCorrected_genBinning_preWidthScalingAtEnd(TH1D* &H1D_jet
479487
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
480488
} else {
481489
if (mcIsWeighted) {
482-
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
490+
if (!controlMC_useMcpCollCountForNorm) {
491+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
492+
} else {
493+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_gen_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
494+
}
483495
} else {
484-
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
496+
if (!controlMC_useMcpCollCountForNorm) {
497+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
498+
} else {
499+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_gen( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
500+
}
485501
}
486502
}
487503
}
@@ -505,9 +521,17 @@ void Get_Pt_spectrum_bkgCorrected_fineBinning_preWidthScalingAtEnd(TH1D* &H1D_je
505521
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
506522
} else {
507523
if (mcIsWeighted) {
508-
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
524+
if (!controlMC_useMcpCollCountForNorm) {
525+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
526+
} else {
527+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_gen_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
528+
}
509529
} else {
510-
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
530+
if (!controlMC_useMcpCollCountForNorm) {
531+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
532+
} else {
533+
NormaliseRawHistToNEvents(H1D_jetPt, GetNEventsSelected_JetFramework_gen( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
534+
}
511535
}
512536
}
513537
}

‎Jets/JetSpectrum_Unfolding.C‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -366,10 +366,18 @@ std::pair<int, RooUnfold*> Get_Pt_spectrum_unfolded_preWidthScalingAtEnd(TH1D* &
366366
NormaliseRawHistToNEvents(H1D_jetPt_unfolded, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
367367
} else {
368368
if (mcIsWeighted) {
369-
NormaliseRawHistToNEvents(H1D_jetPt_unfolded, GetNEventsSelected_JetFramework_weighted(file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
369+
if (!controlMC_useMcpCollCountForNorm) {
370+
NormaliseRawHistToNEvents(H1D_jetPt_unfolded, GetNEventsSelected_JetFramework_weighted(file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
371+
} else {
372+
NormaliseRawHistToNEvents(H1D_jetPt_unfolded, GetNEventsSelected_JetFramework_gen_weighted(file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
373+
}
370374
} else {
371-
NormaliseRawHistToNEvents(H1D_jetPt_unfolded, GetNEventsSelected_JetFramework(file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
372-
}
375+
if (!controlMC_useMcpCollCountForNorm) {
376+
NormaliseRawHistToNEvents(H1D_jetPt_unfolded, GetNEventsSelected_JetFramework(file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
377+
} else {
378+
NormaliseRawHistToNEvents(H1D_jetPt_unfolded, GetNEventsSelected_JetFramework_gen(file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
379+
}
380+
}
373381
}
374382
}
375383
cout << "Get_Pt_spectrum_unfolded_preWidthScalingAtEnd test 2" << endl;
@@ -569,9 +577,17 @@ void Get_Pt_spectrum_dataUnfoldedThenRefolded_preWidthScalingAtEnd(TH1D* &H1D_je
569577
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
570578
} else {
571579
if (mcIsWeighted) {
572-
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
580+
if (!controlMC_useMcpCollCountForNorm) {
581+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
582+
} else {
583+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_gen_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
584+
}
573585
} else {
574-
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
586+
if (!controlMC_useMcpCollCountForNorm) {
587+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
588+
} else {
589+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_gen( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
590+
}
575591
}
576592
}
577593
}
@@ -689,9 +705,17 @@ void Get_Pt_spectrum_dataUnfoldedThenRefolded_RooUnfoldMethod_preWidthScalingAtE
689705
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework(file_O2Analysis_list[iDataset], analysisWorkflowData));
690706
} else {
691707
if (mcIsWeighted) {
692-
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
708+
if (!controlMC_useMcpCollCountForNorm) {
709+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
710+
} else {
711+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_gen_weighted( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
712+
}
693713
} else {
694-
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
714+
if (!controlMC_useMcpCollCountForNorm) {
715+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
716+
} else {
717+
NormaliseRawHistToNEvents(H1D_jetPt_unfoldedThenRefolded, GetNEventsSelected_JetFramework_gen( file_O2Analysis_ppSimDetectorEffect_unfoldingControl[iDataset], analysisWorkflow_unfoldingControl));
718+
}
695719
}
696720
}
697721
}

‎Jets/JetSpectrum_settings_template.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ bool transposeResponseHistogramsInDrawing = false; // default is false; if set
9090

9191
bool automaticBestSvdParameter = false; // automatic function not well setup yet, should work on it; keep false for now
9292

93+
bool controlMC_useMcpCollCountForNorm = false; //if controlMC is true, controlMC_useMcpCollCountForNorm=true will normalise by N_mccoll rather than N_coll : just unfolding function for now, maybe try getmcpdistrib as well
94+
9395
float ptWindowDisplay[2] = {5, 140}; // used for drawn histograms of unfolded distrib
9496
std::array<std::array<float, 2>, 2> drawnWindowUnfoldedMeasurement = {{{ptWindowDisplay[0], ptWindowDisplay[1]}, {-999, -999}}}; // {{xmin, xmax}, {ymin, ymax}}
9597

0 commit comments

Comments
 (0)