Skip to content

Commit c686c70

Browse files
committed
[RF] Remove remaining traces of Proof
1 parent 4d8144e commit c686c70

9 files changed

+6
-130
lines changed

roofit/roofitcore/src/RooStudyPackage.cxx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -179,17 +179,6 @@ Int_t RooStudyPackage::initRandom()
179179
//gRandom->SetSeed(0) ;
180180
Int_t seed = random.Integer(TMath::Limits<Int_t>::Max()) ;
181181

182-
// get worker number
183-
TString worknumber = gEnv->GetValue("ProofServ.Ordinal","undef");
184-
int iworker = -1;
185-
if (worknumber != "undef")
186-
iworker = int( worknumber.Atof()*10 + 0.1);
187-
188-
if (iworker >= 0) {
189-
for (int i = 0; i <= iworker; ++i )
190-
seed = random.Integer( TMath::Limits<Int_t>::Max() );
191-
}
192-
193182
RooRandom::randomGenerator()->SetSeed(seed) ;
194183
gRandom->SetSeed(seed) ;
195184

roofit/roostats/inc/RooStats/SimpleLikelihoodRatioTestStat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace RooStats {
2424

2525
public:
2626

27-
/// Constructor for proof. Do not use.
27+
/// Constructor for proof, now removed. Do not use.
2828
SimpleLikelihoodRatioTestStat() = default;
2929

3030
/// Takes null and alternate parameters from PDF. Can be overridden.

tutorials/roofit/roostats/HybridInstructional.C

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ void HybridInstructional(int ntoys = 6000)
492492
c->SaveAs("zbi.pdf");
493493

494494
// -----------------------------------------
495-
// OUTPUT W/O PROOF (2.66 GHz Intel Core i7)
495+
// OUTPUT (2.66 GHz Intel Core i7)
496496
// =========================================
497497

498498
// -----------------------------------------
@@ -545,36 +545,6 @@ void HybridInstructional(int ntoys = 6000)
545545
// - CL_s: 0.511341 +/- 0.0158183
546546
// Real time 0:05:06, CP time 306.330
547547

548-
// ---------------------------------------------------------
549-
// OUTPUT w/ PROOF (2.66 GHz Intel Core i7, 4 virtual cores)
550-
// =========================================================
551-
552-
// -----------------------------------------
553-
// Part 5
554-
// Results HybridCalculator_result:
555-
// - Null p-value = 0.00075 +/- 0.000173124
556-
// - Significance = 3.17468 sigma
557-
// - Number of S+B toys: 1000
558-
// - Number of B toys: 20000
559-
// - Test statistic evaluated on data: 10.8198
560-
// - CL_b: 0.99925 +/- 0.000193577
561-
// - CL_s+b: 0.454 +/- 0.0157443
562-
// - CL_s: 0.454341 +/- 0.0157564
563-
// Real time 0:00:16, CP time 0.990
564-
565-
// -----------------------------------------
566-
// Part 6
567-
// Results HybridCalculator_result:
568-
// - Null p-value = 0.0007 +/- 0.000152699
569-
// - Significance = 3.19465 sigma
570-
// - Number of S+B toys: 1000
571-
// - Number of B toys: 30000
572-
// - Test statistic evaluated on data: 5.03388
573-
// - CL_b: 0.9993 +/- 0.000152699
574-
// - CL_s+b: 0.518 +/- 0.0158011
575-
// - CL_s: 0.518363 +/- 0.0158124
576-
// Real time 0:01:25, CP time 0.580
577-
578548
// ----------------------------------
579549
// Comparison
580550
// ----------------------------------

tutorials/roofit/roostats/HybridInstructional.py

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ class BinCountTestStat : public TestStatistic {
492492
c.SaveAs("zbi.pdf")
493493

494494
# -----------------------------------------
495-
# OUTPUT W/O PROOF (2.66 GHz Intel Core i7)
495+
# OUTPUT (2.66 GHz Intel Core i7)
496496
# =========================================
497497

498498
# -----------------------------------------
@@ -545,36 +545,6 @@ class BinCountTestStat : public TestStatistic {
545545
# - CL_s: 0.511341 +/- 0.0158183
546546
# Real time 0:05:06, CP time 306.330
547547

548-
# ---------------------------------------------------------
549-
# OUTPUT w/ PROOF (2.66 GHz Intel Core i7, 4 virtual cores)
550-
# =========================================================
551-
552-
# -----------------------------------------
553-
# Part 5
554-
# Results HybridCalculator_result:
555-
# - Null p-value = 0.00075 +/- 0.000173124
556-
# - Significance = 3.17468 sigma
557-
# - Number of S+B toys: 1000
558-
# - Number of B toys: 20000
559-
# - Test statistic evaluated on data: 10.8198
560-
# - CL_b: 0.99925 +/- 0.000193577
561-
# - CL_s+b: 0.454 +/- 0.0157443
562-
# - CL_s: 0.454341 +/- 0.0157564
563-
# Real time 0:00:16, CP time 0.990
564-
565-
# -----------------------------------------
566-
# Part 6
567-
# Results HybridCalculator_result:
568-
# - Null p-value = 0.0007 +/- 0.000152699
569-
# - Significance = 3.19465 sigma
570-
# - Number of S+B toys: 1000
571-
# - Number of B toys: 30000
572-
# - Test statistic evaluated on data: 5.03388
573-
# - CL_b: 0.9993 +/- 0.000152699
574-
# - CL_s+b: 0.518 +/- 0.0158011
575-
# - CL_s: 0.518363 +/- 0.0158124
576-
# Real time 0:01:25, CP time 0.580
577-
578548
# ----------------------------------
579549
# Comparison
580550
# ----------------------------------

tutorials/roofit/roostats/HybridStandardForm.C

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
/// - demonstrates usage of different test statistics
3737
/// - explains subtle choices in the prior used for hybrid methods
3838
/// - demonstrates usage of different priors for the nuisance parameters
39-
/// - demonstrates usage of PROOF
4039
///
4140
/// The basic setup here is that a main measurement has observed x events with an
4241
/// expectation of s+b. One can choose an ad hoc prior for the uncertainty on b,
@@ -154,8 +153,7 @@ void HybridStandardForm(int ntoys = 6000)
154153
// 5. RooStats ToyMC with an equivalent test statistic
155154
// 6. RooStats ToyMC with simultaneous control & main measurement
156155

157-
// Part 4 takes ~4 min without PROOF.
158-
// Part 5 takes about ~2 min with PROOF on 4 cores.
156+
// Part 4 takes ~4 min.
159157
// Of course, everything looks nicer with more toys, which takes longer.
160158

161159
TStopwatch t;
@@ -389,7 +387,7 @@ void HybridStandardForm(int ntoys = 6000)
389387
return; // so standard tutorial runs faster
390388

391389
//---------------------------------------------
392-
// OUTPUT W/O PROOF (2.66 GHz Intel Core i7)
390+
// OUTPUT (2.66 GHz Intel Core i7)
393391
// ============================================
394392

395393
// -----------------------------------------
@@ -409,21 +407,6 @@ void HybridStandardForm(int ntoys = 6000)
409407
// - CL_s: 0.495512 +/- 0.0158272
410408
// Real time 0:04:43, CP time 283.780
411409

412-
// With PROOF
413-
// -----------------------------------------
414-
// Part 5
415-
416-
// Results HybridCalculator_result:
417-
// - Null p-value = 0.00105 +/- 0.000206022
418-
// - Significance = 3.07571 sigma
419-
// - Number of S+B toys: 1000
420-
// - Number of B toys: 20000
421-
// - Test statistic evaluated on data: 10.8198
422-
// - CL_b: 0.99895 +/- 0.000229008
423-
// - CL_s+b: 0.491 +/- 0.0158088
424-
// - CL_s: 0.491516 +/- 0.0158258
425-
// Real time 0:02:22, CP time 0.990
426-
427410
//-------------------------------------------------------
428411
// Comparison
429412
//-------------------------------------------------------

tutorials/roofit/roostats/HybridStandardForm.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ class BinCountTestStat : public TestStatistic {
366366
quit() # so standard tutorial runs faster
367367

368368
# ---------------------------------------------
369-
# OUTPUT W/O PROOF (2.66 GHz Intel Core i7)
369+
# OUTPUT (2.66 GHz Intel Core i7)
370370
# ============================================
371371

372372
# -----------------------------------------
@@ -386,21 +386,6 @@ class BinCountTestStat : public TestStatistic {
386386
# - CL_s: 0.495512 +/- 0.0158272
387387
# Real time 0:04:43, CP time 283.780
388388

389-
# With PROOF
390-
# -----------------------------------------
391-
# Part 5
392-
393-
# Results HybridCalculator_result:
394-
# - Null p-value = 0.00105 +/- 0.000206022
395-
# - Significance = 3.07571 sigma
396-
# - Number of S+B toys: 1000
397-
# - Number of B toys: 20000
398-
# - Test statistic evaluated on data: 10.8198
399-
# - CL_b: 0.99895 +/- 0.000229008
400-
# - CL_s+b: 0.491 +/- 0.0158088
401-
# - CL_s: 0.491516 +/- 0.0158258
402-
# Real time 0:02:22, CP time 0.990
403-
404389
# -------------------------------------------------------
405390
# Comparison
406391
# -------------------------------------------------------

tutorials/roofit/roostats/OneSidedFrequentistUpperLimitWithBands.C

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,6 @@
5252
/// Building the confidence belt can be computationally expensive. Once it is built,
5353
/// one could save it to a file and use it in a separate step.
5454
///
55-
/// We can use PROOF to speed things along in parallel, however,
56-
/// the test statistic has to be installed on the workers
57-
/// so either turn off PROOF or include the modified test statistic
58-
/// in your `$ROOTSYS/roofit/roostats/inc` directory,
59-
/// add the additional line to the LinkDef.h file,
60-
/// and recompile root.
61-
///
6255
/// Note, if you have a boundary on the parameter of interest (eg. cross-section)
6356
/// the threshold on the one-sided test statistic starts off very small because we
6457
/// are only including downward fluctuations. You can see the threshold in these printouts:

tutorials/roofit/roostats/TwoSidedFrequentistUpperLimitWithBands.C

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@
5959
/// Building the confidence belt can be computationally expensive.
6060
/// Once it is built, one could save it to a file and use it in a separate step.
6161
///
62-
/// We can use PROOF to speed things along in parallel, however,
63-
/// the test statistic has to be installed on the workers
64-
/// so either turn off PROOF or include the modified test statistic
65-
/// in your $ROOTSYS/roofit/roostats/inc directory,
66-
/// add the additional line to the LinkDef.h file,
67-
/// and recompile root.
68-
///
6962
/// Note, if you have a boundary on the parameter of interest (eg. cross-section)
7063
/// the threshold on the two-sided test statistic starts off at moderate values and plateaus.
7164
///

tutorials/roofit/roostats/TwoSidedFrequentistUpperLimitWithBands.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@
5959
# Building the confidence belt can be computationally expensive.
6060
# Once it is built, one could save it to a file and use it in a separate step.
6161
#
62-
# We can use PROOF to speed things along in parallel, however,
63-
# the test statistic has to be installed on the workers
64-
# so either turn off PROOF or include the modified test statistic
65-
# in your $ROOTSYS/roofit/roostats/inc directory,
66-
# add the additional line to the LinkDef.h file,
67-
# and recompile root.
68-
#
6962
# Note, if you have a boundary on the parameter of interest (eg. cross-section)
7063
# the threshold on the two-sided test statistic starts off at moderate values and plateaus.
7164
#

0 commit comments

Comments
 (0)