Skip to content

Commit 2327617

Browse files
ajgilbertajgilbert
authored
Merge pull request #811 from ajgilbert/update-tutorial-for-113x
Fix tutorial cards for part3, update docs, fix channel masks
2 parents b08e1f3 + 4318102 commit 2327617

File tree

8 files changed

+49
-52
lines changed

8 files changed

+49
-52
lines changed

‎data/tutorials/longexercise/datacard_part3_DY_cr.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ process W QCD Zmumu ttbar
1212
process 1 2 3 4 5 6
1313
rate 59.9999 141.725 305423 34341.1 5273.43 115.34
1414
--------------------------------------------------------------------------------
15-
CMS_eff_m lnN - - 1.04 1.04 - -
16-
acceptance_DY_cr lnN - - 1.02 - - -
15+
CMS_eff_m lnN - - - 1.04 - -
16+
acceptance_DY_cr lnN - - 1.005 - - -
1717
lumi_13TeV lnN 1.025 - - - 1.025 1.025
1818
* autoMCStats 0

‎data/tutorials/longexercise/datacard_part3_ttbar_cr.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ process W QCD ttbar VV
1212
process 1 2 3 4 5
1313
rate 597.336 308.965 67280.4 10589.6 150.025
1414
--------------------------------------------------------------------------------
15-
CMS_eff_e lnN 1.02 - 1.02 1.02 1.02
16-
CMS_eff_m lnN 1.02 - 1.02 1.02 1.02
15+
CMS_eff_e lnN 1.02 - - 1.02 1.02
16+
CMS_eff_m lnN 1.02 - - 1.02 1.02
1717
acceptance_ttbar_cr lnN - - 1.01 - -
18-
lumi_13TeV lnN 1.025 - 1.025 1.025 1.025
18+
lumi_13TeV lnN 1.025 - - 1.025 1.025
1919
top_pt_ttbar_shape shape - - 1 - -
2020
* autoMCStats 0

‎docs/part3/images/impacts.png

-325 KB
Loading

‎docs/part5/images/freeze_first_attempt.png

-660 Bytes
Loading

‎docs/part5/images/freeze_second_attempt.png

-490 Bytes
Loading

‎docs/part5/longexercise.md

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -408,16 +408,16 @@ shapes * signal_region datacard_part3.shapes.root signal_region/$P
408408
shapes bbHtautau signal_region datacard_part3.shapes.root signal_region/bbHtautau$MASS signal_region/bbHtautau$MASS_$SYSTEMATIC
409409
shapes * ttbar_cr datacard_part3_ttbar_cr.shapes.root tt_control_region/$PROCESS tt_control_region/$PROCESS_$SYSTEMATIC
410410
----------------------------------------------------------------------------------------------------------------------------------
411-
bin signal_region ttbar_cr DY_cr
412-
observation 3416 79251 365754
411+
bin signal_region ttbar_cr DY_cr
412+
observation 3416 79251 365754
413413
----------------------------------------------------------------------------------------------------------------------------------
414-
bin signal_region signal_region signal_region signal_region signal_region ttbar_cr ttbar_cr ttbar_cr ttbar_cr ttbar_cr DY_cr DY_cr DY_cr DY_cr DY_cr DY_cr
415-
process bbHtautau ttbar diboson Ztautau jetFakes Ztautau ttbar VV W QCD W Ztautau VV QCD ttbar Zmumu
416-
process 0 1 2 3 4 3 1 5 6 7 6 3 5 7 1 8
417-
rate 198.521 683.017 96.5185 742.649 2048.94 150.025 67280.4 10589.6 597.336 308.965 59.9999 115.34 5273.43 141.725 34341.1 305423
414+
bin signal_region signal_region signal_region signal_region signal_region ttbar_cr ttbar_cr ttbar_cr ttbar_cr ttbar_cr DY_cr DY_cr DY_cr DY_cr DY_cr DY_cr
415+
process bbHtautau ttbar diboson Ztautau jetFakes W QCD ttbar VV Ztautau W QCD Zmumu ttbar VV Ztautau
416+
process 0 1 2 3 4 5 6 1 7 3 5 6 8 1 7 3
417+
rate 198.521 683.017 96.5185 742.649 2048.94 597.336 308.965 67280.4 10589.6 150.025 59.9999 141.725 305423 34341.1 5273.43 115.34
418418
----------------------------------------------------------------------------------------------------------------------------------
419-
CMS_eff_b lnN 1.02 1.02 1.02 1.02 - - - - - - - - - - - -
420-
CMS_eff_e lnN - - - - - 1.02 1.02 1.02 1.02 - - - - - - -
419+
CMS_eff_b lnN 1.02 1.02 1.02 1.02 - - - - - - - - - - - -
420+
CMS_eff_e lnN - - - - - 1.02 - - 1.02 1.02 - - - - - -
421421
...
422422
```
423423
</details>
@@ -546,37 +546,37 @@ root [1] limit->Scan("r:deltaNLL")
546546
************************************
547547
* Row * r * deltaNLL *
548548
************************************
549-
* 0 * 0.5010952 * 0 *
550-
* 1 * -0.949999 * 5.0565371 *
551-
* 2 * -0.850000 * 4.4238944 *
552-
* 3 * -0.75 * 3.8230235 *
553-
* 4 * -0.649999 * 3.2571268 *
554-
* 5 * -0.550000 * 2.7290999 *
555-
* 6 * -0.449999 * 2.2421050 *
556-
* 7 * -0.349999 * 1.7986002 *
557-
* 8 * -0.25 * 1.4009695 *
558-
* 9 * -0.150000 * 1.0512697 *
559-
* 10 * -0.050000 * 0.7508889 *
560-
* 11 * 0.0500000 * 0.5007593 *
561-
* 12 * 0.1500000 * 0.3015080 *
562-
* 13 * 0.25 * 0.1530667 *
563-
* 14 * 0.3499999 * 0.0549822 *
564-
* 15 * 0.4499999 * 0.0062253 *
565-
* 16 * 0.5500000 * 0.0055419 *
566-
* 17 * 0.6499999 * 0.0512909 *
567-
* 18 * 0.75 * 0.1416319 *
568-
* 19 * 0.8500000 * 0.2743169 *
569-
* 20 * 0.9499999 * 0.4471097 *
570-
* 21 * 1.0499999 * 0.6578967 *
571-
* 22 * 1.1499999 * 0.9042429 *
572-
* 23 * 1.25 * 1.1838192 *
573-
* 24 * 1.3500000 * 1.4944315 *
574-
* 25 * 1.4500000 * 1.8335464 *
575-
* 26 * 1.5499999 * 2.1993224 *
576-
* 27 * 1.6499999 * 2.5896029 *
577-
* 28 * 1.75 * 3.0024433 *
578-
* 29 * 1.8500000 * 3.4359285 *
579-
* 30 * 1.9500000 * 3.8883554 *
549+
* 0 * 0.5399457 * 0 *
550+
* 1 * -0.949999 * 5.6350698 *
551+
* 2 * -0.850000 * 4.9482779 *
552+
* 3 * -0.75 * 4.2942519 *
553+
* 4 * -0.649999 * 3.6765284 *
554+
* 5 * -0.550000 * 3.0985388 *
555+
* 6 * -0.449999 * 2.5635135 *
556+
* 7 * -0.349999 * 2.0743820 *
557+
* 8 * -0.25 * 1.6337506 *
558+
* 9 * -0.150000 * 1.2438088 *
559+
* 10 * -0.050000 * 0.9059833 *
560+
* 11 * 0.0500000 * 0.6215767 *
561+
* 12 * 0.1500000 * 0.3910581 *
562+
* 13 * 0.25 * 0.2144184 *
563+
* 14 * 0.3499999 * 0.0911308 *
564+
* 15 * 0.4499999 * 0.0201983 *
565+
* 16 * 0.5500000 * 0.0002447 *
566+
* 17 * 0.6499999 * 0.0294311 *
567+
* 18 * 0.75 * 0.1058298 *
568+
* 19 * 0.8500000 * 0.2272539 *
569+
* 20 * 0.9499999 * 0.3912534 *
570+
* 21 * 1.0499999 * 0.5952836 *
571+
* 22 * 1.1499999 * 0.8371513 *
572+
* 23 * 1.25 * 1.1142146 *
573+
* 24 * 1.3500000 * 1.4240909 *
574+
* 25 * 1.4500000 * 1.7644306 *
575+
* 26 * 1.5499999 * 2.1329684 *
576+
* 27 * 1.6499999 * 2.5273966 *
577+
* 28 * 1.75 * 2.9458723 *
578+
* 29 * 1.8500000 * 3.3863399 *
579+
* 30 * 1.9500000 * 3.8469560 *
580580
************************************
581581
```
582582
</details>
@@ -715,6 +715,3 @@ For a model with two POIs it is often useful to look at the how well we are able
715715

716716
- Run a 2D likelihood scan in `r_ggH` and `r_bbH`. You can start with around 100 points but may need to increase this later too see more detail in the resulting plot.
717717
- Have a look at the output limit tree, it should have branches for each POI as well as the usual deltaNLL value. You can use TTree::Draw to plot a 2D histogram of deltaNLL with `r_ggH` and `r_bbH` on the axes.
718-
719-
720-

‎docs/part5/longexerciseanswers.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,21 +148,21 @@ Only tasks, no questions in this section
148148
<details>
149149
<summary><b>Show answer</b></summary>
150150

151-
<b> As expected uncertainty you should get <code> -0.42542/+0.458748 </code> </b>
151+
<b> As expected uncertainty you should get <code> -0.417238/+0.450593 </code> </b>
152152

153153
</details>
154-
- Using the RooFitResult in the `fitdiagnostics.root` file, check the post-fit value of the rateParams. To what level are the normalisations of the DY and ttbar processes constrained?
154+
- Using the RooFitResult in the `fitDiagnosticsTest.root` file, check the post-fit value of the rateParams. To what level are the normalisations of the DY and ttbar processes constrained?
155155
<details>
156156
<summary><b>Show answer</b></summary>
157157

158-
<b> They are constrained to around 4-5% </b>
158+
<b> They are constrained to around 1-2% </b>
159159

160160
</details>
161161
- To compare to the previous approach of fitting the SR only, with cross section and acceptance uncertainties restored, an additional card is provided: `datacard_part3_nocrs.txt`. Run the same fit on this card to verify the improvement of the SR+CR approach
162162
<details>
163163
<summary><b>Show answer</b></summary>
164164

165-
<b> The expected uncertainty is larger with only the SR: <code> -0.463273/+0.499161 </code> compared with <code> -0.42542/+0.458748 </code> in the SR+CR approach. </b>
165+
<b> The expected uncertainty is larger with only the SR: <code> -0.465799/+0.502088 </code> compared with <code> -0.417238/+0.450593 </code> in the SR+CR approach. </b>
166166

167167
</details>
168168

‎src/Combine.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ void Combine::run(TString hlfFile, const std::string &dataset, double &limit, do
341341
if (POI->getSize() > 1) std::cerr << "ModelConfig '" << modelConfigName_ << "' defines more than one parameter of interest. This is not supported in some statistical methods." << std::endl;
342342
if (mc->GetObservables() == 0) throw std::invalid_argument("ModelConfig '"+modelConfigName_+"' does not define observables.");
343343
if (mc->GetPdf() == 0) throw std::invalid_argument("ModelConfig '"+modelConfigName_+"' does not define a pdf.");
344-
if (auto pdf = dynamic_cast<RooSimultaneous*>(mc->GetPdf()); pdf!=nullptr) {
344+
if (auto pdf = dynamic_cast<RooSimultaneous*>(mc->GetPdf()); pdf!=nullptr && dynamic_cast<RooSimultaneousOpt*>(pdf)==nullptr) {
345345
if (rebuildSimPdf_) {
346346
pdf = utils::rebuildSimPdf(*mc->GetObservables(), pdf);
347347
w->import(*pdf);

0 commit comments

Comments
 (0)