Merge pull request #9333 from cms-met/MVAMET-75X-from-72X-13TeV-Train…

…ing-30Jan15 Update of the MVAMET algorithm plus use of new training files
cms-sw · Jun 12, 2015 · 9f68ee0 · 9f68ee0
2 parents eb6ebd4 + f5ce07b
commit 9f68ee0
Show file tree

Hide file tree

Showing 6 changed files with 198 additions and 320 deletions.
diff --git a/RecoMET/METPUSubtraction/interface/PFMETAlgorithmMVA.h b/RecoMET/METPUSubtraction/interface/PFMETAlgorithmMVA.h
@@ -58,21 +58,14 @@ class PFMETAlgorithmMVA
   void print(std::ostream&) const;
 
  private:
+  const std::string updateVariableNames(std::string input);
+  const GBRForest* loadMVAfromFile(const edm::FileInPath& inputFileName, const std::string& mvaName);
+  const GBRForest* loadMVAfromDB(const edm::EventSetup& es, const std::string& mvaName);
 
-  void setInput(double, double, double,
-		double, double, double,
-		double, double, double,
-		double, double, double,
-		double, double, double,
-		double, double, double,
-		double, double, double,
-		double, double, 
-		double);
-
-  void evaluateU();
-  void evaluateDPhi();
-  void evaluateCovU1();
-  void evaluateCovU2();
+  const float evaluateU();
+  const float evaluateDPhi();
+  const float evaluateCovU1();
+  const float evaluateCovU2();
 
   MvaMEtUtilities utils_;
 
@@ -83,41 +76,29 @@ class PFMETAlgorithmMVA
 
   int    mvaType_;
   bool   hasPhotons_;
-
-  Float_t pfSumEt_;
-  Float_t pfU_;
-  Float_t pfPhi_;
-  Float_t tkSumEt_;
-  Float_t tkU_;
-  Float_t tkPhi_;
-  Float_t npuSumEt_;
-  Float_t npuU_;
-  Float_t npuPhi_;
-  Float_t puSumEt_;
-  Float_t puMEt_;
-  Float_t puPhi_;
-  Float_t pucSumEt_;
-  Float_t pucU_;
-  Float_t pucPhi_;
-  Float_t jet1Pt_;
-  Float_t jet1Eta_;
-  Float_t jet1Phi_;
-  Float_t jet2Pt_;
-  Float_t jet2Eta_;
-  Float_t jet2Phi_;
-  Float_t numJetsPtGt30_;
-  Float_t numJets_;
-  Float_t numVertices_;
-
-  Float_t* mvaInputU_;
-  Float_t* mvaInputDPhi_;
-  Float_t* mvaInputCovU1_;
-  Float_t* mvaInputCovU2_;
+
+  double dZcut_;
+  std::unique_ptr<float[]> createFloatVector(std::vector<std::string> variableNames);
+  const float GetResponse(const GBRForest *Reader, std::vector<std::string> &variableNames);
+  void computeMET();
+  std::map<std::string, float> var_;
+
+
+  float* mvaInputU_;
+  float* mvaInputDPhi_;
+  float* mvaInputCovU1_;
+  float* mvaInputCovU2_;
 
-  Float_t mvaOutputU_;
-  Float_t mvaOutputDPhi_;
-  Float_t mvaOutputCovU1_;
-  Float_t mvaOutputCovU2_;
+  float mvaOutputU_;
+  float mvaOutputDPhi_;
+  float mvaOutputCovU1_;
+  float mvaOutputCovU2_;
+
+  std::vector<std::string> varForU_;
+  std::vector<std::string> varForDPhi_;
+  std::vector<std::string> varForCovU1_;
+  std::vector<std::string> varForCovU2_;
+
 
   double sumLeptonPx_;
   double sumLeptonPy_;

diff --git a/RecoMET/METPUSubtraction/plugins/PFMETProducerMVA.h b/RecoMET/METPUSubtraction/plugins/PFMETProducerMVA.h
@@ -106,7 +106,6 @@ namespace reco
     edm::EDGetTokenT<edm::Handle<double> > srcRho_;
 
     std::string correctorLabel_;
-    bool isOld42_ ;
     bool useType1_;
 
     double globalThreshold_;

diff --git a/RecoMET/METPUSubtraction/python/mvaPFMET_cff.py b/RecoMET/METPUSubtraction/python/mvaPFMET_cff.py
@@ -72,11 +72,17 @@
     globalThreshold = cms.double(-1.),#pfMet.globalThreshold,
     minCorrJetPt = cms.double(-1.),
     inputFileNames = cms.PSet(
-        U     = cms.FileInPath('RecoMET/METPUSubtraction/data/gbrmet_53_Sep2013_type1.root'),
-        DPhi  = cms.FileInPath('RecoMET/METPUSubtraction/data/gbrmetphi_53_June2013_type1.root'),
-        CovU1 = cms.FileInPath('RecoMET/METPUSubtraction/data/gbru1cov_53_Dec2012.root'),
-        CovU2 = cms.FileInPath('RecoMET/METPUSubtraction/data/gbru2cov_53_Dec2012.root')
-          ),
+        U     = cms.FileInPath('RecoMET/METPUSubtraction/data/gbrmet_7_2_X_MINIAOD_BX25PU20_Mar2015.root'),
+        DPhi  = cms.FileInPath('RecoMET/METPUSubtraction/data/gbrphi_7_2_X_MINIAOD_BX25PU20_Mar2015.root'),
+        CovU1 = cms.FileInPath('RecoMET/METPUSubtraction/data/gbru1cov_7_2_X_MINIAOD_BX25PU20_Mar2015.root'),
+        CovU2 = cms.FileInPath('RecoMET/METPUSubtraction/data/gbru2cov_7_2_X_MINIAOD_BX25PU20_Mar2015.root')
+    ),
+    inputRecords = cms.PSet(
+        U     = cms.string("RecoilCor"),
+        DPhi  = cms.string("PhiCor"), 
+        CovU1 = cms.string("CovU1"),
+        CovU2 = cms.string("CovU2")
+    ),
     loadMVAfromDB = cms.bool(False),                             
 
     corrector = cms.string("ak4PFL1Fastjet"),