Skip to content

Commit a3ca9da

Browse files
lvermuntlvermunt
authored
Trigger efficiency fix corrected yield macro (#648)
* Trigger efficiency fix Corr. Yield macro * Update DBs for adding 0-9999
1 parent 96d6d52 commit a3ca9da

File tree

5 files changed

+60
-53
lines changed

5 files changed

+60
-53
lines changed

‎machine_learning_hep/HFPtSpectrum.C‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,8 +1135,8 @@ void HFPtSpectrum ( Int_t decayChan=kDplusKpipi,
11351135
}
11361136

11371137
void HFPtSpectrum2 (const char *inputCrossSection,
1138-
Double_t triggereff = 1,
1139-
Double_t triggereffunc = 0,
1138+
Double_t triggereff = 1, //bug fixed 22/04/20
1139+
Double_t triggereffunc = 0, //not used in calculation
11401140
const char *efffilename="Efficiencies.root",
11411141
const char *nameeffprompt= "eff",
11421142
const char *nameefffeed = "effB",
@@ -1229,6 +1229,13 @@ void HFPtSpectrum2 (const char *inputCrossSection,
12291229
printf("Histogram with number of events for norm not found in raw yiled file\n");
12301230
printf(" nevents = %.0f will be used\n",nevents);
12311231
}
1232+
if(triggereff != 1){
1233+
printf("\nTrigger efficiency set: %.4f!\n",triggereff);
1234+
printf("Scaling nevents (multiplicity bin convention): nevents_new = nevents / eff_trig");
1235+
Double_t neventsold = nevents;
1236+
nevents = nevents / triggereff;
1237+
printf(" nevents = %.0f will be used (old nevents = %.0f)\n",nevents,neventsold);
1238+
}
12321239

12331240
Int_t fnPtBins = hRECpt->GetNbinsX();
12341241
Double_t *fPtBinLimits = new Double_t[fnPtBins+1];
@@ -1334,9 +1341,9 @@ void HFPtSpectrum2 (const char *inputCrossSection,
13341341
Double_t x = histoYieldCorr->GetBinCenter(ibin);
13351342

13361343
// Sigma calculation
1337-
// Sigma = ( 1. / (lumi * delta_y * BR_c * ParticleAntiPartFactor * eff_trig * eff_c ) ) * spectra (corrected for feed-down)
1344+
// Sigma = ( 1. / (lumi * delta_y * BR_c * ParticleAntiPartFactor * eff_c ) ) * spectra (corrected for feed-down)
13381345
if (hDirectEffpt->GetBinContent(ibin) && hDirectEffpt->GetBinContent(ibin)!=0. && hRECpt->GetBinContent(ibin)>0.) {
1339-
value = histoYieldCorr->GetBinContent(ibin) / ( deltaY * branchingRatioC * fParticleAntiParticle * fLuminosity[0] * fTrigEfficiency[0] * hDirectEffpt->GetBinContent(ibin) );
1346+
value = histoYieldCorr->GetBinContent(ibin) / ( deltaY * branchingRatioC * fParticleAntiParticle * fLuminosity[0] * hDirectEffpt->GetBinContent(ibin) );
13401347
}
13411348

13421349
// Sigma statistical uncertainty:

‎machine_learning_hep/data/data_prod_20200304/database_ml_parameters_D0pp_0304.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -456,21 +456,21 @@ D0pp:
456456
SPDvspt_ntrkl:
457457
proc_type: Dhadrons_mult
458458
useperiod: [0,0,1]
459-
plotbin: [0,0,0,0,1]
459+
plotbin: [0,0,0,0,0,1]
460460
usesinglebineff: 3
461461
fprompt_from_mb: true
462462
corresp_mb_typean: MBvspt_ntrkl
463-
corrEffMult: [false, true, true, true, true]
464-
sel_binmin2: [1,1,10,30,60] #list of var2 splittng nbins
465-
sel_binmax2: [9999,9,29,59,100] #list of var2 splitting nbins
463+
corrEffMult: [false, false, true, true, true, true]
464+
sel_binmin2: [0,1,1,10,30,60] #list of var2 splittng nbins
465+
sel_binmax2: [9999,9999,9,29,59,100] #list of var2 splitting nbins
466466
var_binning2: n_tracklets_corr_sub
467467
var_binning2_gen: n_tracklets_corr
468468
nbinshisto: 200
469469
minvaluehisto: -0.5
470470
maxvaluehisto: 199.5
471471
# here the trigger efficiency is set to 1. Corrections are implemented in the analysis step
472-
triggereff: [1.,1.,1.,1.,1.]
473-
triggereffunc: [0.,0.,0.,0.,0.]
472+
triggereff: [1.,1.,1.,1.,1.,1.]
473+
triggereffunc: [0.,0.,0.,0.,0.,0.]
474474
triggerbit: HighMultSPD
475475
isNbx2: False #Estimate the feeddown systematic with Nb and Nbx2 method convolution
476476
event_cand_validation: True
@@ -509,10 +509,10 @@ D0pp:
509509
masspeak: 1.864
510510
massmin: [1.74,1.7,1.7,1.7,1.7,1.7]
511511
massmax: [2.1,2.1,2.1,2.1,2.1,2.1]
512-
rebin: [[6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6]]
513-
includesecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
512+
rebin: [[6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6]]
513+
includesecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
514514
masssecpeak: -1.0
515-
fix_masssecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
515+
fix_masssecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
516516
#Fraction Dplus/Ds (taken from pp5TeV as we don't store it in TTrees)
517517
widthsecpeak: -1
518518
fix_widthsecpeak: false
@@ -553,20 +553,20 @@ D0pp:
553553
MBvspt_ntrkl:
554554
proc_type: Dhadrons_mult
555555
useperiod: [1,1,1]
556-
plotbin: [1,1,1,1,0]
556+
plotbin: [1,1,1,1,1,0]
557557
usesinglebineff: null
558558
fprompt_from_mb: true
559559
corresp_mb_typean: null
560-
corrEffMult: [false,true,true,true,true]
561-
sel_binmin2: [1,1,10,30,60] #list of var2 splittng nbins
562-
sel_binmax2: [9999,9,29,59,99] #list of var2 splitting nbins
560+
corrEffMult: [false,false,true,true,true,true]
561+
sel_binmin2: [0,1,1,10,30,60] #list of var2 splittng nbins
562+
sel_binmax2: [9999,9999,9,29,59,99] #list of var2 splitting nbins
563563
var_binning2: n_tracklets_corr_sub
564564
var_binning2_gen: n_tracklets_corr
565565
nbinshisto: 200
566566
minvaluehisto: -0.5
567567
maxvaluehisto: 199.5
568-
triggereff: [0.92,0.862,1,1,1]
569-
triggereffunc: [0.003,0.018,0,0,0]
568+
triggereff: [1,0.92,0.862,1,1,1]
569+
triggereffunc: [0,0.003,0.018,0,0,0]
570570
triggerbit: INT7
571571
event_cand_validation: True
572572
sel_an_binmin: [1,2,4,6,8,12] # [1,2,4,6,8,12] #list of pt nbins
@@ -604,10 +604,10 @@ D0pp:
604604
masspeak: 1.864
605605
massmin: [1.75,1.7,1.7,1.7,1.7,1.7]
606606
massmax: [2.1,2.1,2.1,2.1,2.1,2.1]
607-
rebin: [[6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6]]
608-
includesecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
607+
rebin: [[6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6]]
608+
includesecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
609609
masssecpeak: -1.0
610-
fix_masssecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
610+
fix_masssecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
611611
#Fraction Dplus/Ds (taken from pp5TeV as we don't store it in TTrees)
612612
widthsecpeak: -1
613613
fix_widthsecpeak: false

‎machine_learning_hep/data/data_prod_20200304/database_ml_parameters_Dspp.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -270,20 +270,20 @@ Dspp:
270270
MBvspt_ntrkl:
271271
proc_type: Dhadrons_mult
272272
useperiod: [1,1,1]
273-
plotbin: [1,1,1,1,0]
273+
plotbin: [1,1,1,1,1,0]
274274
usesinglebineff: null
275275
fprompt_from_mb: true
276276
corresp_mb_typean: null
277-
corrEffMult: [false,true,true,true,true]
278-
sel_binmin2: [1,1,10,30,60] #list of var2 splittng nbins
279-
sel_binmax2: [9999,9,29,59,99] #list of var2 splitting nbins
277+
corrEffMult: [false,false,true,true,true,true]
278+
sel_binmin2: [0,1,1,10,30,60] #list of var2 splittng nbins
279+
sel_binmax2: [9999,9999,9,29,59,99] #list of var2 splitting nbins
280280
var_binning2: n_tracklets_corr_sub
281281
var_binning2_gen: n_tracklets_corr
282282
nbinshisto: 200
283283
minvaluehisto: -0.5
284284
maxvaluehisto: 199.5
285-
triggereff: [0.92,0.862,1,1,1]
286-
triggereffunc: [0.003,0.018,0,0,0]
285+
triggereff: [1,0.92,0.862,1,1,1]
286+
triggereffunc: [0,0.003,0.018,0,0,0]
287287
triggerbit: INT7
288288
sel_an_binmin: [2,4,6,8,12] # [1,2,4,6,8,12] #list of pt nbins
289289
sel_an_binmax: [4,6,8,12,24] # [2,4,6,8,12,24] #list of pt nbins
@@ -319,10 +319,10 @@ Dspp:
319319
masspeak: 1.969
320320
massmin: [1.75,1.75,1.75,1.75,1.75]
321321
massmax: [2.15,2.15,2.15,2.15,2.15]
322-
rebin: [[5,8,8,8,12], [6,8,8,8,12], [5,8,8,8,12], [5,8,8,8,12], [8,10,10,10,12]]
323-
includesecpeak: [[true, true, true, true, true],[true, true, true, true, true],[true, true, true, true, true],[true, true, true, true, true],[false, false, false, false, false]]
322+
rebin: [[5,8,8,8,12], [5,8,8,8,12], [6,8,8,8,12], [5,8,8,8,12], [5,8,8,8,12], [8,10,10,10,12]]
323+
includesecpeak: [[true, true, true, true, true],[true, true, true, true, true],[true, true, true, true, true],[true, true, true, true, true],[true, true, true, true, true],[false, false, false, false, false]]
324324
masssecpeak: 1.869
325-
fix_masssecpeak: [[false, false, false, false, false],[true, false, true, false, true],[false, false, false, false, true],[true, false, false, false, true],[true, true, true, true, true]]
325+
fix_masssecpeak: [[false, false, false, false, false],[false, false, false, false, false],[true, false, true, false, true],[false, false, false, false, true],[true, false, false, false, true],[true, true, true, true, true]]
326326
#Fraction Dplus/Ds (taken from pp5TeV as we don't store it in TTrees)
327327
widthsecpeak: 0.92
328328
fix_widthsecpeak: true

‎machine_learning_hep/data/data_prod_20200304/database_ml_parameters_LcpK0spp_0304.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ LcpK0spp:
444444
usesinglebineff: null
445445
fprompt_from_mb: true
446446
corresp_mb_typean: null
447-
corrEffMult: [false, true, true, true, true]
447+
corrEffMult: [false, false, true, true, true]
448448
sel_binmin2: [0,1,1,10,30] #list of var2 splittng nbins
449449
sel_binmax2: [9999,9999,9,29,59] #list of var2 splitting nbins
450450
var_binning2: n_tracklets_corr_sub
@@ -539,7 +539,7 @@ LcpK0spp:
539539
usesinglebineff: 3
540540
fprompt_from_mb: true
541541
corresp_mb_typean: MBvspt_ntrkl
542-
corrEffMult: [false, true, true, true, true]
542+
corrEffMult: [false, false, true, true, true, true]
543543
sel_binmin2: [0,1,1,10,30,60] #list of var2 splittng nbins
544544
sel_binmax2: [9999,9999,9,29,59,100] #list of var2 splitting nbins
545545
var_binning2: n_tracklets_corr_sub
@@ -586,9 +586,9 @@ LcpK0spp:
586586
massmax: [2.436,2.436,2.436,2.436,2.436,2.436]
587587
rebin: [7,7,8,9,10,12]
588588

589-
includesecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
589+
includesecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
590590
masssecpeak: 2.2864
591-
fix_masssecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
591+
fix_masssecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
592592
widthsecpeak: 0.01
593593
fix_widthsecpeak: true
594594

‎machine_learning_hep/data/data_prod_20200417/database_ml_parameters_D0pp_0417.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -465,21 +465,21 @@ D0pp:
465465
SPDvspt_ntrkl:
466466
proc_type: Dhadrons_mult
467467
useperiod: [0,0,1]
468-
plotbin: [0,0,0,0,1]
468+
plotbin: [0,0,0,0,0,1]
469469
usesinglebineff: 3
470470
fprompt_from_mb: true
471471
corresp_mb_typean: MBvspt_ntrkl
472-
corrEffMult: [false, true, true, true, true]
473-
sel_binmin2: [1,1,10,30,60] #list of var2 splittng nbins
474-
sel_binmax2: [9999,9,29,59,100] #list of var2 splitting nbins
472+
corrEffMult: [false, false, true, true, true, true]
473+
sel_binmin2: [0,1,1,10,30,60] #list of var2 splittng nbins
474+
sel_binmax2: [9999,9999,9,29,59,100] #list of var2 splitting nbins
475475
var_binning2: n_tracklets_corr_sub
476476
var_binning2_gen: n_tracklets_corr
477477
nbinshisto: 200
478478
minvaluehisto: -0.5
479479
maxvaluehisto: 199.5
480480
# here the trigger efficiency is set to 1. Corrections are implemented in the analysis step
481-
triggereff: [1.,1.,1.,1.,1.]
482-
triggereffunc: [0.,0.,0.,0.,0.]
481+
triggereff: [1.,1.,1.,1.,1.,1.]
482+
triggereffunc: [0.,0.,0.,0.,0.,0.]
483483
triggerbit: HighMultSPD
484484
isNbx2: False #Estimate the feeddown systematic with Nb and Nbx2 method convolution
485485
event_cand_validation: True
@@ -518,10 +518,10 @@ D0pp:
518518
masspeak: 1.864
519519
massmin: [1.74,1.7,1.7,1.7,1.7,1.7]
520520
massmax: [2.1,2.1,2.1,2.1,2.1,2.1]
521-
rebin: [[6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6]]
522-
includesecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
521+
rebin: [[6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6]]
522+
includesecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
523523
masssecpeak: -1.0
524-
fix_masssecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
524+
fix_masssecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
525525
#Fraction Dplus/Ds (taken from pp5TeV as we don't store it in TTrees)
526526
widthsecpeak: -1
527527
fix_widthsecpeak: false
@@ -562,20 +562,20 @@ D0pp:
562562
MBvspt_ntrkl:
563563
proc_type: Dhadrons_mult
564564
useperiod: [1,1,1]
565-
plotbin: [1,1,1,1,0]
565+
plotbin: [1,1,1,1,1,0]
566566
usesinglebineff: null
567567
fprompt_from_mb: true
568568
corresp_mb_typean: null
569-
corrEffMult: [false,true,true,true,true]
570-
sel_binmin2: [1,1,10,30,60] #list of var2 splittng nbins
571-
sel_binmax2: [9999,9,29,59,99] #list of var2 splitting nbins
569+
corrEffMult: [false,false,true,true,true,true]
570+
sel_binmin2: [0,1,1,10,30,60] #list of var2 splittng nbins
571+
sel_binmax2: [9999,9999,9,29,59,99] #list of var2 splitting nbins
572572
var_binning2: n_tracklets_corr_sub
573573
var_binning2_gen: n_tracklets_corr
574574
nbinshisto: 200
575575
minvaluehisto: -0.5
576576
maxvaluehisto: 199.5
577-
triggereff: [0.92,0.862,1,1,1]
578-
triggereffunc: [0.003,0.018,0,0,0]
577+
triggereff: [1,0.92,0.862,1,1,1]
578+
triggereffunc: [0,0.003,0.018,0,0,0]
579579
triggerbit: INT7
580580
event_cand_validation: True
581581
sel_an_binmin: [1,2,4,6,8,12] # [1,2,4,6,8,12] #list of pt nbins
@@ -613,10 +613,10 @@ D0pp:
613613
masspeak: 1.864
614614
massmin: [1.75,1.7,1.7,1.7,1.7,1.7]
615615
massmax: [2.1,2.1,2.1,2.1,2.1,2.1]
616-
rebin: [[6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6]]
617-
includesecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
616+
rebin: [[6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6], [6,6,6,6,6,6]]
617+
includesecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
618618
masssecpeak: -1.0
619-
fix_masssecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
619+
fix_masssecpeak: [[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false],[false, false, false, false, false, false]]
620620
#Fraction Dplus/Ds (taken from pp5TeV as we don't store it in TTrees)
621621
widthsecpeak: -1
622622
fix_widthsecpeak: false

0 commit comments

Comments
 (0)