diff --git a/DataFormats/METReco/interface/MET.h b/DataFormats/METReco/interface/MET.h
index 642df0e0b0ac1..a1293376fb05f 100755
--- a/DataFormats/METReco/interface/MET.h
+++ b/DataFormats/METReco/interface/MET.h
@@ -71,6 +71,9 @@ namespace reco
//________________________________________________________________________||
void setSignificanceMatrix(const reco::METCovMatrix& matrix);
+ void setSumEt(const double & sumEt){
+ sumet = sumEt;
+ };
reco::METCovMatrix getSignificanceMatrix(void) const;
private:
diff --git a/RecoMET/METPUSubtraction/BuildFile.xml b/RecoMET/METPUSubtraction/BuildFile.xml
index 092ffdb18113f..7289d95abf318 100644
--- a/RecoMET/METPUSubtraction/BuildFile.xml
+++ b/RecoMET/METPUSubtraction/BuildFile.xml
@@ -1,21 +1,50 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/RecoMET/METPUSubtraction/interface/MvaMEtUtilities.h b/RecoMET/METPUSubtraction/interface/MvaMEtUtilities.h
deleted file mode 100644
index 96e51563305d5..0000000000000
--- a/RecoMET/METPUSubtraction/interface/MvaMEtUtilities.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef RecoMET_METPUSubtraction_mvaMEtUtilities_h
-#define RecoMET_METPUSubtraction_mvaMEtUtilities_h
-
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include "DataFormats/Candidate/interface/Candidate.h"
-#include "DataFormats/METReco/interface/CommonMETData.h"
-#include "DataFormats/METReco/interface/PUSubMETData.h"
-
-#include
-#include
-
-class MvaMEtUtilities
-{
- public:
-
- enum {kPFCands=0,kLeptons,kJets};
- enum {kPF=0, kChHS, kHS, kPU, kHSMinusNeutralPU};
-
- private:
-
- CommonMETData leptonsSum_;
- CommonMETData leptonsChSum_;
- CommonMETData pfCandSum_;
- CommonMETData pfCandChHSSum_;
- CommonMETData pfCandChPUSum_;
- CommonMETData neutralJetHSSum_;
- CommonMETData neutralJetPUSum_;
-
- std::vector cleanedJets_;
-
- double dzCut_;
- double ptThreshold_;
-
- public:
-
- MvaMEtUtilities(const edm::ParameterSet& cfg);
- virtual ~MvaMEtUtilities();
-
- reco::Candidate::LorentzVector leadJetP4(const std::vector&);
- reco::Candidate::LorentzVector subleadJetP4(const std::vector&);
- unsigned numJetsAboveThreshold(const std::vector&, double);
-
- const std::vector& getCleanedJets() const;
-
- //access functions for lepton suns ============
- double getLeptonsSumMEX() const;
- double getLeptonsSumMEY() const;
-
- double getLeptonsChSumMEX() const;
- double getLeptonsChSumMEY() const;
-
- //recoil and sum computing functions ========
- void computeAllSums(const std::vector& jets,
- const std::vector& leptons,
- const std::vector& pfCandidates);
-
- CommonMETData computeRecoil(int metType);
-
-
- protected:
-
- reco::Candidate::LorentzVector jetP4(const std::vector&, unsigned);
-
- // cuts on jet Id. MVA output in bins of jet Pt and eta
- double mvaCut_[3][4][4];
-
- private:
-
- //utilities functions for jets ===============
- bool passesMVA(const reco::Candidate::LorentzVector&, double);
-
- std::vector cleanJets(const std::vector&,
- const std::vector&, double, double);
-
- //utilities functions for pf candidate ======
- std::vector cleanPFCands(const std::vector&,
- const std::vector&, double, bool);
-
- CommonMETData computeCandSum( int compKey, double dZmax, int dZflag,
- bool iCharged, bool mvaPassFlag,
- const std::vector& objects );
-
-
- void finalize(CommonMETData& metData);
-
-};
-
-#endif
diff --git a/RecoMET/METPUSubtraction/interface/PFMETAlgorithmMVA.h b/RecoMET/METPUSubtraction/interface/PFMETAlgorithmMVA.h
deleted file mode 100644
index 140546bf052ae..0000000000000
--- a/RecoMET/METPUSubtraction/interface/PFMETAlgorithmMVA.h
+++ /dev/null
@@ -1,121 +0,0 @@
-#ifndef RecoMET_METPUSubtraction_PFMETAlgorithmMVA_h
-#define RecoMET_METPUSubtraction_PFMETAlgorithmMVA_h
-
-/** \class PFMETAlgorithmMVA
- *
- * MVA based algorithm for computing the particle-flow missing Et
- *
- * \authors Phil Harris, CERN
- * Christian Veelken, LLR
- *
- */
-
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include "CondFormats/EgammaObjects/interface/GBRForest.h"
-
-#include "DataFormats/Candidate/interface/Candidate.h"
-#include "DataFormats/METReco/interface/MET.h"
-#include "DataFormats/VertexReco/interface/Vertex.h"
-
-#include "RecoMET/METPUSubtraction/interface/MvaMEtUtilities.h"
-
-//#include
-#include