search

CERN-PH-CMG / cmg-cmssw

CERN CMG Tools repository. Installation instructions available on the twiki:
https://twiki.cern.ch/twiki/bin/viewauth/CMS/CMGToolsReleasesExperimental
19 stars 244 forks source link

Update heppy_94X_dev to CMSSW_9_4_6_patch1 #730

Closed peruzzim closed 6 years ago

peruzzim commented 6 years ago

Merge of CMSSW_9_4_6_patch1 (12d5af2) into the current heppy_94X_dev. No conflict to be solved.

The only differences between the upstream release and the heppy branch lie in the heppy packages, which are not modified by the merge (see diff below).

git diff --name-status CMSSW_9_4_6_patch1 heppy_94X_dev_merge946p1
A   PhysicsTools/Heppy/data/pdfQG_AK4chs_13TeV_cmssw8020_v2.root
D   PhysicsTools/Heppy/data/pdfQG_AK4chs_13TeV_v2b.root
A   PhysicsTools/Heppy/data/pdfQG_AK4chs_antib_13TeV_cmssw8020_v2.root
D   PhysicsTools/Heppy/data/pdfQG_AK4chs_antib_13TeV_v1.root
M   PhysicsTools/Heppy/interface/AlphaT.h
M   PhysicsTools/Heppy/interface/CMGMuonCleanerBySegmentsAlgo.h
A   PhysicsTools/Heppy/interface/FloatZipper.h
M   PhysicsTools/Heppy/interface/IsolationComputer.h
A   PhysicsTools/Heppy/interface/genutils.h
M   PhysicsTools/Heppy/python/analyzers/core/JSONAnalyzer.py
M   PhysicsTools/Heppy/python/analyzers/core/VertexHistograms.py
M   PhysicsTools/Heppy/python/analyzers/core/autovars.py
M   PhysicsTools/Heppy/python/analyzers/eventtopology/AlphaTAnalyzer.py
M   PhysicsTools/Heppy/python/analyzers/gen/GeneratorAnalyzer.py
M   PhysicsTools/Heppy/python/analyzers/gen/LHEWeightAnalyzer.py
M   PhysicsTools/Heppy/python/analyzers/objects/IsoTrackAnalyzer.py
M   PhysicsTools/Heppy/python/analyzers/objects/JetAnalyzer.py
M   PhysicsTools/Heppy/python/analyzers/objects/LeptonAnalyzer.py
M   PhysicsTools/Heppy/python/analyzers/objects/METAnalyzer.py
M   PhysicsTools/Heppy/python/analyzers/objects/PhotonAnalyzer.py
M   PhysicsTools/Heppy/python/analyzers/objects/TauAnalyzer.py
M   PhysicsTools/Heppy/python/analyzers/objects/autophobj.py
M   PhysicsTools/Heppy/python/physicsobjects/Electron.py
M   PhysicsTools/Heppy/python/physicsobjects/Jet.py
M   PhysicsTools/Heppy/python/physicsobjects/Lepton.py
M   PhysicsTools/Heppy/python/physicsobjects/Muon.py
M   PhysicsTools/Heppy/python/physicsobjects/Photon.py
M   PhysicsTools/Heppy/python/physicsobjects/Tau.py
M   PhysicsTools/Heppy/python/physicsutils/ElectronMVAID.py
M   PhysicsTools/Heppy/python/physicsutils/JetReCalibrator.py
M   PhysicsTools/Heppy/python/physicsutils/KalmanMuonCorrector.py
A   PhysicsTools/Heppy/python/physicsutils/PuJetIDWP.py
M   PhysicsTools/Heppy/python/physicsutils/genutils.py
M   PhysicsTools/Heppy/python/utils/miniAodFiles.py
M   PhysicsTools/Heppy/src/AlphaT.cc
M   PhysicsTools/Heppy/src/BTagSF.cc
M   PhysicsTools/Heppy/src/CMGMuonCleanerBySegmentsAlgo.cc
A   PhysicsTools/Heppy/src/FloatZipper.cc
M   PhysicsTools/Heppy/src/IsolationComputer.cc
M   PhysicsTools/Heppy/src/classes.h
M   PhysicsTools/Heppy/src/classes_def.xml
A   PhysicsTools/Heppy/src/genutils.cc
M   PhysicsTools/Heppy/test/makeAK5Jets.py
M   PhysicsTools/HeppyCore/python/framework/heppy_loop.py
M   PhysicsTools/HeppyCore/python/framework/looper.py
M   PhysicsTools/HeppyCore/python/statistics/tree.py
M   PhysicsTools/HeppyCore/python/utils/batchmanager.py
M   PhysicsTools/HeppyCore/python/utils/dataset.py
M   PhysicsTools/HeppyCore/python/utils/diclist.py
M   PhysicsTools/HeppyCore/python/utils/eostools.py
M   PhysicsTools/HeppyCore/scripts/heppy_batch.py
M   PhysicsTools/HeppyCore/scripts/heppy_hadd.py
M   PhysicsTools/HeppyCore/scripts/heppy_loop.py
A   PhysicsTools/HeppyCore/scripts/heppy_untarcfg.py
A   PhysicsTools/HeppyCore/scripts/run_condor.sh
A   PhysicsTools/HeppyCore/scripts/run_condor_simple.sh
git diff --name-status heppy_94X_dev heppy_94X_dev_merge946p1 | grep Heppy
<NULL OUTPUT>