Merge pull request #7135 from lveldere/fastsim-temp-fix-nucl-interact…

…ions

Fastsim temp fix nucl interactions

FastSimulation/Configuration/python/FamosSequences_cff.py

@@ -56,9 +56,10 @@
 from RecoJets.Configuration.CaloTowersRec_cff import *
 
 # Particle Flow (all interactions with ParticleFlow are dealt with in the following configuration)
-#from FastSimulation.ParticleFlow.ParticleFlowFastSim_cff import *
-from FastSimulation.ParticleFlow.ParticleFlowFastSimNeutralHadron_cff import * # this is the famous "PF patch", see https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideFastSimFAQ#I_observe_a_discrepancy_in_energ
+from FastSimulation.ParticleFlow.ParticleFlowFastSim_cff import *
+#from FastSimulation.ParticleFlow.ParticleFlowFastSimNeutralHadron_cff import * # this is the famous "PF patch", see https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideFastSimFAQ#I_observe_a_discrepancy_in_energ
 
+from RecoTauTag.Configuration.RecoPFTauTag_cff import *
 
 # Reco Jets and MET
 from RecoJets.Configuration.RecoJetsGlobal_cff import *
@@ -446,7 +447,7 @@
             metreco+
             reducedRecHits+
             famosBTaggingSequence+
-            famosPFTauTaggingSequence
+            PFTau
             )
     elif(MixingMode=='DigiRecoMixing'):
         reconstructionWithFamos = cms.Sequence(
@@ -472,7 +473,7 @@
             metreco+
             reducedRecHits+
             famosBTaggingSequence+
-            famosPFTauTaggingSequence
+            PFTau
             )
     else:
         print 'unsupported MixingMode label'
@@ -501,7 +502,7 @@
         metreco+
         reducedRecHits+
         famosBTaggingSequence+
-        famosPFTauTaggingSequence
+        PFTau
         )
 
 
@@ -540,7 +541,7 @@
     metreco+
     reducedRecHits+
     famosBTaggingSequence+
-    famosPFTauTaggingSequence
+    PFTau
 )
 
 # Famos pre-defined sequences (and self-explanatory names)
@@ -710,7 +711,7 @@
 
 famosWithPFTauTagging = cms.Sequence(
     famosWithCaloTowersAndParticleFlow+
-    famosPFTauTaggingSequence
+    PFTau
 )
 
 # The simulation sequence without muon digitization
@@ -751,7 +752,7 @@
     metreco+
     reducedRecHits+
     famosBTaggingSequence+
-    famosPFTauTaggingSequence
+    PFTau
 )
 
 # Simulation plus reconstruction

FastSimulation/MaterialEffects/python/MaterialEffects_cfi.py

@@ -41,7 +41,7 @@
 	# Smallest pT for the Mutliple Scattering 
         pTmin = cms.double(0.2),
 	# Enable Nuclear Interactions
-        NuclearInteraction = cms.bool(True),
+        NuclearInteraction = cms.bool(False),  # temporary 12.01.14 until bug-fix for nuclear interactions
 	# The energies of the pions used in the above files (same order)
         pionEnergies = cms.untracked.vdouble(
             1.0, 2.0, 3.0, 4.0, 5.0, 7.0, 9.0, 12.0, 15.0, 20.0, 

FastSimulation/ParticleFlow/python/ParticleFlowFastSimNeutralHadron_cff.py

@@ -91,12 +91,6 @@
 
 
 
-# Tau tagging
-
-from FastSimulation.ParticleFlow.TauTaggingFastSimNeutralHadron_cff import *
-
-
-
 
 
 

FastSimulation/ParticleFlow/python/ParticleFlowFastSim_cff.py

@@ -11,17 +11,20 @@
 from RecoParticleFlow.PFProducer.pfPhotonTranslator_cff import *
 from RecoParticleFlow.PFTracking.trackerDrivenElectronSeeds_cff import *
 from RecoParticleFlow.PFTracking.mergedElectronSeeds_cfi import *
-from FastSimulation.ParticleFlow.FSparticleFlow_cfi import *
-from RecoParticleFlow.PFProducer.pfLinker_cff import *
-# the following is replaced by the mva-based 
+#from FastSimulation.ParticleFlow.FSparticleFlow_cfi import *
+from RecoParticleFlow.PFClusterProducer.towerMakerPF_cfi import *
+# The following is replaced by the MVA-based 
 #from RecoParticleFlow.PFProducer.pfGsfElectronCiCSelector_cff import *
+from RecoEgamma.EgammaIsolationAlgos.particleBasedIsoProducer_cff import *
 from RecoParticleFlow.PFProducer.pfGsfElectronMVASelector_cff import *
+from RecoParticleFlow.PFProducer.pfLinker_cff import *
 from RecoParticleFlow.PFProducer.particleFlowEGamma_cff import *
-
+#particleFlow.PFCandidate = [cms.InputTag("FSparticleFlow")]
 
 particleFlowSimParticle.sim = 'famosSimHits'
 
 #Deactivate the recovery of dead towers since dead towers are not simulated
+
 #Similarly, deactivate HF cleaning for spikes
 particleFlowClusterHF.recHitCleaners = cms.VPSet()
 particleFlowRecHitHF.producers[0].qualityTests =cms.VPSet(
@@ -39,7 +42,6 @@
 
 )
 
-
 #particleFlowBlock.useNuclear = cms.bool(True)
 #particleFlowBlock.useConversions = cms.bool(True)
 #particleFlowBlock.useV0 = cms.bool(True)
@@ -67,14 +69,19 @@
     particleFlowEGammaFull+
     particleFlowTmp+
     particleFlowTmpPtrs+
-    particleFlowEGammaFinal+
-    FSparticleFlow
+    particleFlowEGammaFinal
+    #FSparticleFlow
 )
 
-particleFlowLinks = cms.Sequence(particleFlow*particleFlowPtrs+particleBasedIsolationSequence)
+particleFlowLinks = cms.Sequence(particleFlow+particleFlowPtrs + particleBasedIsolationSequence)
 
 # PF Reco Jets and MET
+
+from RecoJets.JetProducers.PFJetParameters_cfi import PFJetParameters
+#PFJetParameters.src = cms.InputTag("FSparticleFlow") #AG
 from RecoJets.Configuration.RecoPFJets_cff import *
+from RecoMET.METProducers.PFMET_cfi import *
+#pfMet.src = cms.InputTag("FSparticleFlow") #AG
 from RecoMET.Configuration.RecoPFMET_cff import *
 
 PFJetMet = cms.Sequence(
@@ -83,12 +90,6 @@
 )
 
 
-# Tau tagging
-
-from FastSimulation.ParticleFlow.TauTaggingFastSim_cff import *
-
-
-