---

yaml --- r: 76208 b: "refs/heads/CMSSW_7_1_X" c: d7dd2c4 h: "refs/heads/CMSSW_7_1_X" v: v3
cms-sw · Oct 23, 2009 · cfc10d3 · cfc10d3
1 parent dfd27db
commit cfc10d3
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": 1a1a604d14600c84d5b2c8e434c1d0c880aaec64
+"refs/heads/CMSSW_7_1_X": d7dd2c47b0697b0e0490dee35e07a2b2cc3d9ec5
diff --git a/trunk/JetMETCorrections/Algorithms/src/ZSPJetCorrector.cc b/trunk/JetMETCorrections/Algorithms/src/ZSPJetCorrector.cc
@@ -48,14 +48,14 @@ ZSPJetCorrector::~ZSPJetCorrector () {
 
 double ZSPJetCorrector::correction (const LorentzVector& fJet) const {
   double a = mSimpleCorrector[fixedPU]->correctionPtEtaPhiE (fJet.Pt(), fJet.Eta(), fJet.Phi(),fJet.E());
-  std::cout<<" Simple First correction "<<a<<std::endl;
+ // std::cout<<" Simple First correction "<<a<<std::endl;
   double b = a;
   if(iPU >= 0) {
   if(mSimpleCorrectorOffset.size()>0) {
   b = mSimpleCorrectorOffset[fixedPU]->correctionEnEta (a*fJet.E(), fJet.Eta());
-  std::cout<<"Simple  Second correction "<<b<<std::endl;
+  // std::cout<<"Simple  Second correction "<<b<<std::endl;
   } else {
-  std::cout<<" No offset files but iPU "<<iPU<<" check configuration JetMETCorrections/Configuration/python/ZSPOffsetJetCorrections219_cff.py "<<std::endl;
+ // std::cout<<" No offset files but iPU "<<iPU<<" check configuration JetMETCorrections/Configuration/python/ZSPOffsetJetCorrections219_cff.py "<<std::endl;
   }
   }
   return b;
@@ -68,7 +68,7 @@ double ZSPJetCorrector::correction( const reco::Jet& fJet, const edm::Event& iEv
 {
    double b=1.;
    int nPU = 0;
-   cout<<" Event correction "<<iPU<<endl;
+//   cout<<" Event correction "<<iPU<<endl;
    if(iPU > 0) {
 // Look for the Lumi section
 //     LuminosityBlock lbID = iEvent.getLuminosityBlock();
@@ -78,14 +78,14 @@ double ZSPJetCorrector::correction( const reco::Jet& fJet, const edm::Event& iEv
 
 
   double a = mSimpleCorrector[nPU]->correctionPtEtaPhiE (fJet.p4().Pt(), fJet.p4().Eta(), fJet.p4().Phi(),fJet.p4().E());
-  std::cout<<" Lumi section First correction "<<a<<" "<<nPU<<std::endl;
+//  std::cout<<" Lumi section First correction "<<a<<" "<<nPU<<std::endl;
   b = a;
   if(iPU >= 0) {
   if(mSimpleCorrectorOffset.size()>0) {
   b = mSimpleCorrectorOffset[nPU]->correctionEnEta (a*fJet.p4().E(), fJet.p4().Eta());
-  std::cout<<" Lumi section Second correction "<<b<<" "<<nPU<<std::endl;
+ // std::cout<<" Lumi section Second correction "<<b<<" "<<nPU<<std::endl;
   } else {
-  std::cout<<" No offset files but iPU "<<iPU<<" check configuration JetMETCorrections/Configuration/python/ZSPOffsetJetCorrections219_cff.py "<<std::endl;
+ // std::cout<<" No offset files but iPU "<<iPU<<" check configuration JetMETCorrections/Configuration/python/ZSPOffsetJetCorrections219_cff.py "<<std::endl;
   }
   }
 

diff --git a/trunk/JetMETCorrections/JetPlusTrack/test/JetAnalysis_cfg_34X.py b/trunk/JetMETCorrections/JetPlusTrack/test/JetAnalysis_cfg_34X.py
@@ -0,0 +1,67 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("RECO3")
+
+process.load("Configuration.StandardSequences.Services_cff")
+
+process.load("Configuration.StandardSequences.Reconstruction_cff")
+
+process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
+process.GlobalTag.globaltag = cms.string('MC_3XY_V10::All')
+
+
+process.load("Configuration.StandardSequences.Simulation_cff")
+
+process.load("Configuration.StandardSequences.MixingNoPileUp_cff")
+
+process.load("Configuration.StandardSequences.VtxSmearedGauss_cff")
+
+process.load("Configuration.StandardSequences.Geometry_cff")
+
+process.load("Configuration.StandardSequences.MagneticField_cff")
+
+process.load("FWCore.MessageLogger.MessageLogger_cfi")
+
+process.load("JetMETCorrections.Configuration.JetPlusTrackCorrections_cff")
+
+process.load("JetMETCorrections.Configuration.ZSPJetCorrections219_cff")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(10)
+)
+### For 219, file from RelVal
+process.source = cms.Source("PoolSource",
+fileNames = cms.untracked.vstring('/store/relval/CMSSW_3_4_0_pre2/RelValQCD_Pt_80_120/GEN-SIM-RECO/MC_3XY_V10-v1/0003/0AC2D5EB-0FBE-DE11-ABF3-001A92971B04.root')
+)
+
+#process.myjetplustrack = cms.EDFilter("JetPlusTrackAnalysis",
+#    HistOutFile = cms.untracked.string('JetAnalysis.root'),
+#    src2 = cms.InputTag("iterativeCone5GenJets"),
+#    src3 = cms.InputTag("JetPlusTrackZSPCorJetIcone5"),
+#    src4 = cms.InputTag("ZSPJetCorJetIcone5"),
+#    src1 = cms.InputTag("iterativeCone5CaloJets"),
+#    Cone = cms.double(0.5),
+#    ecalInputs = cms.VInputTag(cms.InputTag("ecalRecHit","EcalRecHitsEB"), cms.InputTag("ecalRecHit","EcalRecHitsEE")),
+#    HFRecHitCollectionLabel = cms.InputTag("hfreco"),
+#    HORecHitCollectionLabel = cms.InputTag("horeco"),
+#    HBHERecHitCollectionLabel = cms.InputTag("hbhereco"),
+#    inputTrackLabel = cms.untracked.string('generalTracks')
+#)
+
+process.myjetplustrack = cms.EDFilter("JetPlusTrackAnalysis",
+    HistOutFile = cms.untracked.string('JetAnalysis.root'),
+    src2 = cms.InputTag("sisCone5GenJets"),
+    src3 = cms.InputTag("JetPlusTrackZSPCorJetSiscone5"),
+    src4 = cms.InputTag("ZSPJetCorJetSiscone5"),
+    src1 = cms.InputTag("sisCone5CaloJets"),
+    Cone = cms.double(0.5),
+    ecalInputs = cms.VInputTag(cms.InputTag("ecalRecHit","EcalRecHitsEB"), cms.InputTag("ecalRecHit","EcalRecHitsEE")),
+    HFRecHitCollectionLabel = cms.InputTag("hfreco"),
+    HORecHitCollectionLabel = cms.InputTag("horeco"),
+    HBHERecHitCollectionLabel = cms.InputTag("hbhereco"),
+    inputTrackLabel = cms.untracked.string('generalTracks')
+)
+
+
+
+process.p1 = cms.Path(process.ZSPJetCorrectionsSisCone5*process.JetPlusTrackCorrectionsSisCone5*process.ZSPJetCorrectionsIcone5*process.JetPlusTrackCorrectionsIcone5*process.ZSPJetCorrectionsAntiKt5*process.JetPlusTrackCorrectionsAntiKt5*process.myjetplustrack)