diff --git a/RecoParticleFlow/Configuration/test/RecoToDisplay_NoTracking_cfg.py b/RecoParticleFlow/Configuration/test/RecoToDisplay_NoTracking_cfg.py
index f067545d09d7e..e71c407c1b180 100644
--- a/RecoParticleFlow/Configuration/test/RecoToDisplay_NoTracking_cfg.py
+++ b/RecoParticleFlow/Configuration/test/RecoToDisplay_NoTracking_cfg.py
@@ -4,7 +4,7 @@
process.load("Configuration.StandardSequences.Reconstruction_cff")
process.load("Configuration.StandardSequences.MagneticField_38T_cff")
#process.load("Configuration.StandardSequences.MagneticField_4T_cff")
-process.load("Configuration.StandardSequences.Geometry_cff")
+process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff')
#from Configuration.AlCa.autoCond import autoCond
#process.GlobalTag.globaltag = autoCond['mc']
@@ -81,7 +81,7 @@
process.recoGenMET+
process.particleFlowSimParticle)
-process.load("RecoParticleFlow.PFProducer.particleFlowCandidateChecker_cfi")
+#process.load("RecoParticleFlow.PFProducer.particleFlowCandidateChecker_cfi")
#process.particleFlowCandidateChecker.pfCandidatesReco = cms.InputTag("particleFlow","","REPROD")
#process.particleFlowCandidateChecker.pfCandidatesReReco = cms.InputTag("particleFlow","","REPROD2")
#process.particleFlowCandidateChecker.pfJetsReco = cms.InputTag("ak5PFJets","","REPROD")
diff --git a/RecoParticleFlow/Configuration/test/RecoToDisplay_batch_cfg.py b/RecoParticleFlow/Configuration/test/RecoToDisplay_batch_cfg.py
index 51bb0c7595849..a38d34307e72a 100644
--- a/RecoParticleFlow/Configuration/test/RecoToDisplay_batch_cfg.py
+++ b/RecoParticleFlow/Configuration/test/RecoToDisplay_batch_cfg.py
@@ -10,7 +10,7 @@
process.load("Configuration.StandardSequences.Reconstruction_cff")
process.load("Configuration.StandardSequences.MagneticField_38T_cff")
#process.load("Configuration.StandardSequences.MagneticField_4T_cff")
-process.load("Configuration.StandardSequences.Geometry_cff")
+process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.autoCond import autoCond
process.GlobalTag.globaltag = autoCond['startup']
@@ -54,15 +54,6 @@
fileName=cms.string(outfile_name)
)
-process.pfEGAlgoNewSCTree = cms.EDAnalyzer(
- "PFEGCandidateTreeMaker",
- doGen = cms.untracked.bool(True),
- genSrc = cms.InputTag("genParticles"),
- primaryVertices = cms.InputTag("offlinePrimaryVertices"),
- pfEGammaCandSrc = cms.InputTag('particleFlowEGamma'),
- pfCandSrc = cms.InputTag('particleFlow')
- )
-
process.pfElectronSCTree = cms.EDAnalyzer(
"PFSuperClusterTreeMaker",
doGen = cms.untracked.bool(True),
@@ -120,7 +111,6 @@
process.recoPFJets+
process.recoPFMET+
process.PFTau+
- process.pfEGAlgoNewSCTree+
process.pfElectronSCTree+
process.pfPhotonSCTree+
process.pfMustacheSCTree)
diff --git a/RecoParticleFlow/PFProducer/test/BuildFile.xml b/RecoParticleFlow/PFProducer/test/BuildFile.xml
index 50e22630a89c7..2851dc96cdf3f 100644
--- a/RecoParticleFlow/PFProducer/test/BuildFile.xml
+++ b/RecoParticleFlow/PFProducer/test/BuildFile.xml
@@ -1,18 +1,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -55,18 +40,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -78,19 +51,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/RecoParticleFlow/PFProducer/test/PFBlockComparator.cc b/RecoParticleFlow/PFProducer/test/PFBlockComparator.cc
deleted file mode 100644
index 3965bd145fe1a..0000000000000
--- a/RecoParticleFlow/PFProducer/test/PFBlockComparator.cc
+++ /dev/null
@@ -1,258 +0,0 @@
-//
-// Class: PFEGCandidateTreeMaker.cc
-//
-// Info: Outputs a tree with PF-EGamma information, mostly SC info.
-// Checks to see if the input EG candidates are matched to
-// some existing PF reco (PF-Photons and PF-Electrons).
-//
-// Author: L. Gray (FNAL)
-//
-
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "DataFormats/EgammaCandidates/interface/Photon.h"
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidatePhotonExtra.h"
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateEGammaExtra.h"
-#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
-#include "DataFormats/GsfTrackReco/interface/GsfTrackExtra.h"
-#include "DataFormats/EgammaReco/interface/ElectronSeed.h"
-#include "DataFormats/EgammaReco/interface/SuperCluster.h"
-#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
-#include "DataFormats/VertexReco/interface/Vertex.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "CommonTools/UtilAlgos/interface/TFileService.h"
-#include "DataFormats/Math/interface/deltaR.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
-#include "RecoEcal/EgammaCoreTools/interface/Mustache.h"
-#include "RecoParticleFlow/PFClusterTools/interface/PFEnergyCalibration.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementGsfTrack.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementSuperCluster.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementBrem.h"
-#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
-
-#include "TTree.h"
-#include "TVector2.h"
-
-#include
-#include