Merge pull request cms-sw#15 from appeltel/forest_CMSSW_7_5_0_pre5_Cl…

…usterCompatibility Enable ClusterCompatibility Filter for AOD
harmonicoscillator · Jul 21, 2015 · 24dc074 · 24dc074
2 parents 7954ec4 + d137030
commit 24dc074
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/HeavyIonsAnalysis/Configuration/python/collisionEventSelection_cff.py b/HeavyIonsAnalysis/Configuration/python/collisionEventSelection_cff.py
@@ -15,6 +15,10 @@
 from HLTrigger.special.hltPixelClusterShapeFilter_cfi import *
 hltPixelClusterShapeFilter.inputTag = "siPixelRecHits"
 
+# Cluster-shape filter re-run offline from ClusterCompatibility object
+from HeavyIonsAnalysis.EventAnalysis.HIClusterCompatibilityFilter_cfi import *
+
+
 # Reject BSC beam halo L1 technical bits
 from L1TriggerConfig.L1GtConfigProducers.L1GtTriggerMaskTechTrigConfig_cff import *
 from HLTrigger.HLTfilters.hltLevel1GTSeed_cfi import hltLevel1GTSeed
@@ -28,3 +32,8 @@
                                        primaryVertexFilter *
                                        siPixelRecHits *
                                        hltPixelClusterShapeFilter)
+
+collisionEventSelectionAOD = cms.Sequence(noBSChalo *
+                                          hfCoincFilter3 *
+                                          primaryVertexFilter *
+                                          clusterCompatibilityFilter)
diff --git a/HeavyIonsAnalysis/EventAnalysis/interface/HIClusterCompatibilityFilter.h b/HeavyIonsAnalysis/EventAnalysis/interface/HIClusterCompatibilityFilter.h
@@ -10,8 +10,6 @@
 //
 //
 
-// Don't compile until CMSSW_7_5_0_pre5 or later
-#ifdef CMSSW_7_5_0_pre5_OR_LATER
 
 #include <iostream>
 
@@ -55,4 +53,3 @@ class HIClusterCompatibilityFilter : public edm::EDFilter {
 };
 
 #endif
-#endif
diff --git a/HeavyIonsAnalysis/EventAnalysis/src/HIClusterCompatibilityFilter.cc b/HeavyIonsAnalysis/EventAnalysis/src/HIClusterCompatibilityFilter.cc
@@ -7,9 +7,6 @@
 //
 //
 
-// Don't compile until CMSSW_7_5_0_pre5 or later
-#ifdef CMSSW_7_5_0_pre5_OR_LATER
-
 #include "HeavyIonsAnalysis/EventAnalysis/interface/HIClusterCompatibilityFilter.h"
 
 HIClusterCompatibilityFilter::HIClusterCompatibilityFilter(const edm::ParameterSet& iConfig):
@@ -136,4 +133,3 @@ HIClusterCompatibilityFilter::fillDescriptions(edm::ConfigurationDescriptions& d
 }
 
 DEFINE_FWK_MODULE(HIClusterCompatibilityFilter);
-#endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,8 +10,6 @@ @@
     //
     //
-    // Don't compile until CMSSW_7_5_0_pre5 or later
-    #ifdef CMSSW_7_5_0_pre5_OR_LATER
     #include <iostream>
@@ Expand Down Expand Up / @@ -55,4 +53,3 @@ class HIClusterCompatibilityFilter : public edm::EDFilter { @@
     };
     #endif
-    #endif