From 9fe276a805c67888e9ec18376b6bdb97a476e11f Mon Sep 17 00:00:00 2001 From: Pasquale Musella Date: Tue, 25 Sep 2018 11:32:54 +0200 Subject: [PATCH] cleanup double-H setup and turn on categorization in flashggDoubleHTag_cfi.py --- .gitignore | 5 +- MyAnalysis/test/MyAnalysis.py | 38 --------- Systematics/test/workspaceStd.py | 4 +- .../data/DNN_models/checkpoint | 0 .../data/DNN_models/config.json | 0 .../DNN_models/model-18.data-00000-of-00001 | Bin .../data/DNN_models/model-18.index | Bin .../data/DNN_models/model-18.meta | Bin .../data/DNN_models/model-18.pb | Bin ...eTransformation_20180628_newcode_data.root | Bin ...uGluToHHTo2B2G_node_SM_13TeV-madgraph.root | Bin ...training_with_27_06_2018_fixed.weights.xml | 0 ...ing_with_27_06_2018_newcode_v2.weights.xml | 0 Taggers/python/flashggDoubleHTag_cfi.py | 7 +- .../flashggbRegressionProducer80_cfi.py | 2 +- setup_8_0_X.sh | 4 + testHHbbgg/HHbbgg_MC_2016_80X.json | 74 ------------------ 17 files changed, 15 insertions(+), 119 deletions(-) delete mode 100644 MyAnalysis/test/MyAnalysis.py rename {MetaData => Taggers}/data/DNN_models/checkpoint (100%) rename {MetaData => Taggers}/data/DNN_models/config.json (100%) rename {MetaData => Taggers}/data/DNN_models/model-18.data-00000-of-00001 (100%) rename {MetaData => Taggers}/data/DNN_models/model-18.index (100%) rename {MetaData => Taggers}/data/DNN_models/model-18.meta (100%) rename {MetaData => Taggers}/data/DNN_models/model-18.pb (100%) rename {MetaData => Taggers}/data/HHTagger/cumulativeTransformation_20180628_newcode_data.root (100%) rename {MetaData => Taggers}/data/HHTagger/cumulativeTransformation_output_GluGluToHHTo2B2G_node_SM_13TeV-madgraph.root (100%) rename {MetaData => Taggers}/data/HHTagger/training_with_27_06_2018_fixed.weights.xml (100%) rename {MetaData => Taggers}/data/HHTagger/training_with_27_06_2018_newcode_v2.weights.xml (100%) delete mode 100644 testHHbbgg/HHbbgg_MC_2016_80X.json diff --git a/.gitignore b/.gitignore index c299acd8ba5..3ec3e6c3b74 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,7 @@ AutoDict_* *.txt *.log *.png -*.pdf \ No newline at end of file +*.pdf + +# This is a symlink created by setup.sh +DataFormats/src/classes_def.xml \ No newline at end of file diff --git a/MyAnalysis/test/MyAnalysis.py b/MyAnalysis/test/MyAnalysis.py deleted file mode 100644 index dc09d7999b7..00000000000 --- a/MyAnalysis/test/MyAnalysis.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -from __future__ import print_function -import sys, os, shutil, re, subprocess -import ROOT -from DataFormats.FWLite import Events, Handle -import numpy as np - -def main(): - - from FWCore.ParameterSet.VarParsing import VarParsing - - options = VarParsing ('analysis') - options.inputFiles = "/afs/cern.ch/work/d/devdatta/CMSREL/Flashgg/CMSSW_9_4_2/src/flashgg/myMicroAODOutputFile.root" - options.parseArguments() - - events = Events(options.inputFiles) - nevents = 0 - for event in events: - - h_jets = Handle("std::vector >") - event.getByLabel("flashggFinalJets", h_jets) - - print( "N(jets) = %i" % len(h_jets.product()) ) - jets = h_jets.product()[0] - for jet in jets: - print( "jet pt = %f DeepCSVBDisc = %f" % (jet.pt(), jet.bDiscriminator("pfDeepCSVJetTags:probb")+jet.bDiscriminator("pfDeepCSVJetTags:probbb")) ) - - h_dipho = Handle("std::vector") - event.getByLabel("flashggDiPhotons", h_dipho) - - diphos = h_dipho.product() - print( "N(diphotons) = %i" %len(diphos) ) - for dipho in diphos: - print( "Diphoton pt = %f" % dipho.pt() ) - -if __name__ == "__main__": - main() diff --git a/Systematics/test/workspaceStd.py b/Systematics/test/workspaceStd.py index 07b2c2a6329..e0b900ec1e2 100755 --- a/Systematics/test/workspaceStd.py +++ b/Systematics/test/workspaceStd.py @@ -109,7 +109,7 @@ 'doPdfWeights' ) customize.options.register('dumpTrees', - True, + False, VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.bool, 'dumpTrees' @@ -571,7 +571,7 @@ producer = cms.EDProducer('flashggbRegressionProducer80', JetTag=coll, rhoFixedGridCollection = cms.InputTag('fixedGridRhoFastjetAll'), - bRegressionWeightfile= cms.untracked.string(os.environ["CMSSW_BASE"]+"/src/flashgg/MetaData/data/DNN_models/model-18"), + bRegressionWeightfile= cms.untracked.string(os.environ["CMSSW_BASE"]+"/src/flashgg/Taggers/data/DNN_models/model-18"), y_mean = cms.untracked.double(1.0454729795455933),#check MetaData/data/DNN_models/config.json y_std = cms.untracked.double( 0.31628304719924927) ) diff --git a/MetaData/data/DNN_models/checkpoint b/Taggers/data/DNN_models/checkpoint similarity index 100% rename from MetaData/data/DNN_models/checkpoint rename to Taggers/data/DNN_models/checkpoint diff --git a/MetaData/data/DNN_models/config.json b/Taggers/data/DNN_models/config.json similarity index 100% rename from MetaData/data/DNN_models/config.json rename to Taggers/data/DNN_models/config.json diff --git a/MetaData/data/DNN_models/model-18.data-00000-of-00001 b/Taggers/data/DNN_models/model-18.data-00000-of-00001 similarity index 100% rename from MetaData/data/DNN_models/model-18.data-00000-of-00001 rename to Taggers/data/DNN_models/model-18.data-00000-of-00001 diff --git a/MetaData/data/DNN_models/model-18.index b/Taggers/data/DNN_models/model-18.index similarity index 100% rename from MetaData/data/DNN_models/model-18.index rename to Taggers/data/DNN_models/model-18.index diff --git a/MetaData/data/DNN_models/model-18.meta b/Taggers/data/DNN_models/model-18.meta similarity index 100% rename from MetaData/data/DNN_models/model-18.meta rename to Taggers/data/DNN_models/model-18.meta diff --git a/MetaData/data/DNN_models/model-18.pb b/Taggers/data/DNN_models/model-18.pb similarity index 100% rename from MetaData/data/DNN_models/model-18.pb rename to Taggers/data/DNN_models/model-18.pb diff --git a/MetaData/data/HHTagger/cumulativeTransformation_20180628_newcode_data.root b/Taggers/data/HHTagger/cumulativeTransformation_20180628_newcode_data.root similarity index 100% rename from MetaData/data/HHTagger/cumulativeTransformation_20180628_newcode_data.root rename to Taggers/data/HHTagger/cumulativeTransformation_20180628_newcode_data.root diff --git a/MetaData/data/HHTagger/cumulativeTransformation_output_GluGluToHHTo2B2G_node_SM_13TeV-madgraph.root b/Taggers/data/HHTagger/cumulativeTransformation_output_GluGluToHHTo2B2G_node_SM_13TeV-madgraph.root similarity index 100% rename from MetaData/data/HHTagger/cumulativeTransformation_output_GluGluToHHTo2B2G_node_SM_13TeV-madgraph.root rename to Taggers/data/HHTagger/cumulativeTransformation_output_GluGluToHHTo2B2G_node_SM_13TeV-madgraph.root diff --git a/MetaData/data/HHTagger/training_with_27_06_2018_fixed.weights.xml b/Taggers/data/HHTagger/training_with_27_06_2018_fixed.weights.xml similarity index 100% rename from MetaData/data/HHTagger/training_with_27_06_2018_fixed.weights.xml rename to Taggers/data/HHTagger/training_with_27_06_2018_fixed.weights.xml diff --git a/MetaData/data/HHTagger/training_with_27_06_2018_newcode_v2.weights.xml b/Taggers/data/HHTagger/training_with_27_06_2018_newcode_v2.weights.xml similarity index 100% rename from MetaData/data/HHTagger/training_with_27_06_2018_newcode_v2.weights.xml rename to Taggers/data/HHTagger/training_with_27_06_2018_newcode_v2.weights.xml diff --git a/Taggers/python/flashggDoubleHTag_cfi.py b/Taggers/python/flashggDoubleHTag_cfi.py index 19df7a3b243..2a1834f9094 100644 --- a/Taggers/python/flashggDoubleHTag_cfi.py +++ b/Taggers/python/flashggDoubleHTag_cfi.py @@ -34,14 +34,15 @@ MJJBoundariesUpper = cms.vdouble(146.,153.,150.,155.,150.,147.,154.,151.,155.,155.,155.,148.), #for each category following the convention cat0=MX0 MVA0, cat1=MX1 MVA0, cat2=MX2 MVA0.... MVAConfig = cms.PSet(variables=cms.VPSet(), # variables are added below classifier=cms.string("BDT::bdt"), # classifier name - weights=cms.FileInPath("flashgg/MetaData/data/HHTagger/training_with_27_06_2018_fixed.weights.xml"), # path to TMVA weights + weights=cms.FileInPath("flashgg/Taggers/data/HHTagger/training_with_27_06_2018_fixed.weights.xml"), # path to TMVA weights regression=cms.bool(False), # this is not a regression multiclass=cms.bool(True), # this is multiclass multiclassSignalIdx=cms.int32(2), # this is multiclass index for Signal ), doMVAFlattening=cms.bool(True),#do transformation of cumulative to make it flat - doCategorization=cms.bool(False),#do categorization based on MVA x MX or only fill first tree with all events - MVAFlatteningFileName=cms.untracked.FileInPath("flashgg/MetaData/data/HHTagger/cumulativeTransformation_20180628_newcode_data.root")#FIXME, this should be optional, is it? + doCategorization=cms.bool(True),#do categorization based on MVA x MX or only fill first tree with all events + MVAFlatteningFileName=cms.untracked.FileInPath("flashgg/Taggers/data/HHTagger/cumulativeTransformation_20180628_newcode_data.root")#FIXME, this should be optional, is it? + ## ) cfgTools.addVariables(flashggDoubleHTag.MVAConfig.variables, diff --git a/Taggers/python/flashggbRegressionProducer80_cfi.py b/Taggers/python/flashggbRegressionProducer80_cfi.py index 044be28ec72..635d7df06fc 100644 --- a/Taggers/python/flashggbRegressionProducer80_cfi.py +++ b/Taggers/python/flashggbRegressionProducer80_cfi.py @@ -11,7 +11,7 @@ flashggbRegressionProducer80= cms.EDProducer('flashggbRegressionProducer80', # JetTag=coll, JetTag=cms.InputTag("flashggUnpackedJets","0"), - bRegressionWeightfile= cms.untracked.string("flashgg/MetaData/data/DNN_models/model-18"), + bRegressionWeightfile= cms.untracked.string("flashgg/Taggers/data/DNN_models/model-18"), y_mean = cms.untracked.double(1.0454729795455933), y_std =cms.untracked.double( 0.31628304719924927) ) diff --git a/setup_8_0_X.sh b/setup_8_0_X.sh index 5e09a45b9ac..8e5c750d492 100755 --- a/setup_8_0_X.sh +++ b/setup_8_0_X.sh @@ -156,6 +156,10 @@ cp $CMSSW_BASE/src/flashgg/Systematics/data/Winter_2016_reReco_v1_ele_smearings. cp $CMSSW_BASE/src/flashgg/Systematics/data/Moriond17_74x_pho_scales.dat $CMSSW_BASE/src/EgammaAnalysis/ElectronTools/data cp $CMSSW_BASE/src/flashgg/Systematics/data/Moriond17_74x_pho_smearings.dat $CMSSW_BASE/src/EgammaAnalysis/ElectronTools/data +echo "downloading tensoflow interface" +git clone -b tf_py_cpython https://gitlab.cern.ch/mrieger/CMSSW-DNN.git DNN +./DNN/setup_legacy.sh + echo "adding hook for indentation" ln -s $CMSSW_BASE/src/flashgg/Validation/scripts/flashgg_indent_check.sh $CMSSW_BASE/src/flashgg/.git/hooks/pre-commit diff --git a/testHHbbgg/HHbbgg_MC_2016_80X.json b/testHHbbgg/HHbbgg_MC_2016_80X.json deleted file mode 100644 index 9ad0fafd4d2..00000000000 --- a/testHHbbgg/HHbbgg_MC_2016_80X.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "processes" : { - "GluGluToHHTo2B2G_node_10_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_10_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_11_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_11_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_12_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_12_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_13_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_13_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_2_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_2_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_3_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_3_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_4_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_4_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_5_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_5_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_6_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_6_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_7_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_7_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_8_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_8_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_9_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_9_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_SM_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_SM_13TeV-madgraph" - ], - "GluGluToHHTo2B2G_node_box_13TeV-madgraph" : [ - "/GluGluToHHTo2B2G_node_box_13TeV-madgraph" - ], - "DiPhotonJetsBox_MGG-80toInf_13TeV-Sherpa" : [ - "/DiPhotonJetsBox_MGG-80toInf_13TeV-Sherpa" - ], - "GJet_Pt-20to40_DoubleEMEnriched_MGG-80toInf_TuneCUETP8M1_13TeV_Pythia8" : [ - "/GJet_Pt-20to40_DoubleEMEnriched_MGG-80toInf_TuneCUETP8M1_13TeV_Pythia8" - ], - "GJet_Pt-40toInf_DoubleEMEnriched_MGG-80toInf_TuneCUETP8M1_13TeV_Pythia8" : [ - "/GJet_Pt-40toInf_DoubleEMEnriched_MGG-80toInf_TuneCUETP8M1_13TeV_Pythia8" - ], - "GluGluHToGG_M-125_13TeV_powheg_pythia8" : [ - "/GluGluHToGG_M-125_13TeV_powheg_pythia8" - ], - "VBFHToGG_M-125_13TeV_powheg_pythia8" : [ - "/VBFHToGG_M-125_13TeV_powheg_pythia8" - ], - "VHToGG_M125_13TeV_amcatnloFXFX_madspin_pythia8" : [ - "/VHToGG_M125_13TeV_amcatnloFXFX_madspin_pythia8" - ], - "ttHToGG_M125_13TeV_powheg_pythia8_v2" : [ - "/ttHToGG_M125_13TeV_powheg_pythia8_v2" - ], - "bbHToGG_M-125_4FS_yb2_13TeV_amcatnlo" : [ - "/bbHToGG_M-125_4FS_yb2_13TeV_amcatnlo" - ], - "bbHToGG_M-125_4FS_ybyt_13TeV_amcatnlo" : [ - "/bbHToGG_M-125_4FS_ybyt_13TeV_amcatnlo" - ] - }, - "cmdLine" : "campaign=RunIIMoriond17_HHbbgg_breg_20180601 targetLumi=1e+3 puTarget=2.51e+05,1.15e+06,2.47e+06,3.72e+06,5.19e+06,6.79e+06,8.67e+06,2.31e+07,5.89e+07,1.38e+08,3.12e+08,5.71e+08,8.76e+08,1.21e+09,1.56e+09,1.87e+09,2.08e+09,2.19e+09,2.24e+09,2.28e+09,2.29e+09,2.24e+09,2.15e+09,2.03e+09,1.88e+09,1.71e+09,1.54e+09,1.36e+09,1.19e+09,1.01e+09,8.48e+08,6.94e+08,5.57e+08,4.38e+08,3.37e+08,2.53e+08,1.85e+08,1.31e+08,8.96e+07,5.87e+07,3.68e+07,2.2e+07,1.25e+07,6.75e+06,3.46e+06,1.68e+06,7.79e+05,3.44e+05,1.46e+05,6.13e+04,2.68e+04,1.33e+04,8.25e+03,6.3e+03,5.45e+03,4.97e+03,4.59e+03,4.25e+03,3.92e+03,3.58e+03,3.25e+03,2.93e+03,2.62e+03,2.33e+03,2.05e+03,1.79e+03,1.56e+03,1.34e+03,1.14e+03,969,815,680,563,463,378" -} \ No newline at end of file