---

yaml --- r: 76795 b: "refs/heads/CMSSW_7_1_X" c: e51f23d h: "refs/heads/CMSSW_7_1_X" i: 76793: 74c75a8 76791: 67889ed v: v3
cms-sw · Nov 2, 2009 · 6ccb0e0 · 6ccb0e0
1 parent b1b6688
commit 6ccb0e0
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": f12898f067dbe180000d5502b61ef61daf32939a
+"refs/heads/CMSSW_7_1_X": e51f23d51ac1db43c6d30c9c2d2f2fa05c066f6a
diff --git a/trunk/RecoMET/METProducers/python/METSigParams_cfi.py b/trunk/RecoMET/METProducers/python/METSigParams_cfi.py
@@ -15,6 +15,35 @@
     HO_EtResPar = cms.vdouble(0.,1.3,0.005),
     HO_PhiResPar = cms.vdouble(0.02511),    # 0.087/sqrt(12)
     HF_EtResPar = cms.vdouble(0.,1.82,0.09),
-    HF_PhiResPar = cms.vdouble(0.05022)     # 0.174/sqrt(12)
+    HF_PhiResPar = cms.vdouble(0.05022),     # 0.174/sqrt(12)
+
+    #PF:
+    # type 1: charged hadron - essentially tracking resolutions
+    PF_EtResType1 = cms.vdouble(0.05,0,0),
+    PF_PhiResType1 = cms.vdouble(0.002),  
+
+    # type 2: EM with track (electron) - essentially tracking resolution
+    PF_EtResType2 = cms.vdouble(0.05,0,0),
+    PF_PhiResType2 = cms.vdouble(0.002),
+
+    #type 3: muon
+    PF_EtResType3 = cms.vdouble(0.05,0,0),
+    PF_PhiResType3 = cms.vdouble(0.002),
+
+    # type 4: EM witout track (photon)
+    PF_EtResType4 = cms.vdouble(0.2,0.03,0.005),
+    PF_PhiResType4 = cms.vdouble(0.005),  
+
+    # type 5: hadron without track (all calorimeter)
+    PF_EtResType5 = cms.vdouble(0.,1.22,0.05),
+    PF_PhiResType5 = cms.vdouble(0.02511),
+
+    # type 6: hadron without track (Forward HCAL)
+    PF_EtResType6 = cms.vdouble(0.,1.22,0.05),
+    PF_PhiResType6 = cms.vdouble(0.02511),
+
+    # type 7: EM without track (Forward HCAL)
+    PF_EtResType7 = cms.vdouble(0.,1.22,0.05),
+    PF_PhiResType7 = cms.vdouble(0.02511)  
 
     )
diff --git a/trunk/RecoMET/METProducers/python/PFMET_cfi.py b/trunk/RecoMET/METProducers/python/PFMET_cfi.py
@@ -7,11 +7,15 @@
 # Form uncorrected Missing ET from Particle Flow and store into event as a MET
 # product
 
+from RecoMET.METProducers.METSigParams_cfi import *
+
 pfMet = cms.EDProducer("METProducer",
-                           src = cms.InputTag("particleFlow"),
-                           METType = cms.string('PFMET'),
-                           alias = cms.string('PFMET'),
-                           noHF = cms.bool(False),
-                           globalThreshold = cms.double(0.0),
-                           InputType = cms.string('PFCandidateCollection')
+
+                       METSignificance_params,
+                       src = cms.InputTag("particleFlow"),
+                       METType = cms.string('PFMET'),
+                       alias = cms.string('PFMET'),
+                       noHF = cms.bool(False),
+                       globalThreshold = cms.double(0.0),
+                       InputType = cms.string('PFCandidateCollection')
                        )
diff --git a/trunk/RecoMET/METProducers/src/METProducer.cc b/trunk/RecoMET/METProducers/src/METProducer.cc
@@ -138,7 +138,7 @@ namespace cms
       CaloMET calomet = calospecalgo.addInfo(input,output,noHF, globalThreshold);
 
       //Run algorithm to calculate CaloMET Significance and add to the MET Object
-      SignCaloSpecificAlgo sign_calomet;
+      SignCaloSpecificAlgo signcalospecalgo;
       metsig::SignAlgoResolutions resolutions(conf_);
 
       signcalospecalgo.calculateBaseCaloMET(input,output,resolutions,noHF,globalThreshold);
@@ -168,8 +168,12 @@ namespace cms
 	PFSpecificAlgo pf;
 	std::auto_ptr<PFMETCollection> pfmetcoll;
 	pfmetcoll.reset (new PFMETCollection);
-	pfmetcoll->push_back( pf.addInfo(input, output) );
+	// add resolutions and calculate significance
 	metsig::SignAlgoResolutions resolutions(conf_);
+	pf.runSignificance(resolutions);
+
+	pfmetcoll->push_back( pf.addInfo(input, output) );
+
 	event.put( pfmetcoll );
       }
     //-----------------------------------