diff --git a/interface/HybridNew.h b/interface/HybridNew.h index b08b341ddec..9959cb2c088 100644 --- a/interface/HybridNew.h +++ b/interface/HybridNew.h @@ -56,7 +56,7 @@ class HybridNew : public LimitAlgo { static bool fullGrid_; static bool saveGrid_; static bool noUpdateGrid_; - static unsigned int nCpu_, fork_; + static unsigned int fork_; static bool importanceSamplingNull_, importanceSamplingAlt_; static std::string algo_; static std::string mode_; @@ -90,7 +90,6 @@ class HybridNew : public LimitAlgo { RooStats::ModelConfig modelConfig, modelConfig_bonly; std::unique_ptr qvar; std::unique_ptr toymcsampler; - std::unique_ptr pc; RooArgSet cleanupList; }; diff --git a/src/HybridNew.cc b/src/HybridNew.cc index 5345dc09d7d..f1481ec81a9 100644 --- a/src/HybridNew.cc +++ b/src/HybridNew.cc @@ -65,7 +65,6 @@ bool HybridNew::genNuisances_ = true; bool HybridNew::genGlobalObs_ = false; bool HybridNew::fitNuisances_ = false; unsigned int HybridNew::iterations_ = 1; -unsigned int HybridNew::nCpu_ = 0; // proof-lite mode unsigned int HybridNew::fork_ = 0; // fork mode std::string HybridNew::rValue_ = "1.0"; RooArgSet HybridNew::rValues_; @@ -117,7 +116,6 @@ LimitAlgo("HybridNew specific options") { ("interpAcc", boost::program_options::value(&interpAccuracy_)->default_value(interpAccuracy_), "Minimum uncertainty from interpolation delta(x)/(max(x)-min(x))") ("iterations,i", boost::program_options::value(&iterations_)->default_value(iterations_), "Number of times to throw 'toysH' toys to compute the p-values (for --singlePoint if clsAcc is set to zero disabling adaptive generation)") ("fork", boost::program_options::value(&fork_)->default_value(fork_), "Fork to N processes before running the toys (0 by default == no forking). Only use if you're an expert in combine!") - ("nCPU", boost::program_options::value(&nCpu_)->default_value(nCpu_), "Use N CPUs with PROOF Lite (experimental!)") ("saveHybridResult", "Save result in the output file") ("readHybridResults", "Read and merge results from file (requires option '--grid' or '--toysFile')") ("grid", boost::program_options::value(&gridFile_), "Use the specified file containing a grid of SamplingDistributions for the limit (implies readHybridResults).\n For calculating CLs/pmu values with --singlePoint or if calculating the Signfiicance with LHCmode LHC-significance ( or any option with --signif) use '--toysFile=x.root --readHybridResult' !") @@ -1017,14 +1015,6 @@ std::unique_ptr HybridNew::create(RooWorkspace *w, R if (!mc_b->GetPdf()->canBeExtended()) setup.toymcsampler->SetNEventsPerToy(1); - if (nCpu_ > 0) { - std::cerr << "ALERT: running with proof not validated." << std::endl; - CombineLogger::instance().log("HybridNew.cc",__LINE__,"[WARNING] running with proof not validated.",__func__); - if (verbose > 1) CombineLogger::instance().log("HybridNew.cc",__LINE__,std::string(Form(" Will use %d CPUs.",nCpu_)),__func__); - setup.pc.reset(new ProofConfig(*w, nCpu_, "", kFALSE)); - setup.toymcsampler->SetProofConfig(setup.pc.get()); - } - std::unique_ptr hc(new HybridCalculator(data, setup.modelConfig, setup.modelConfig_bonly, setup.toymcsampler.get())); if (genNuisances_ || !genGlobalObs_) { if (withSystematics) {