Merge branch 'canorman-newPileUpCorrections' into 'master'

Change data dependencies

See merge request !908

Hlt/RecoConf/python/RecoConf/calorimeter_reconstruction.py

@@ -193,13 +193,14 @@ def make_photons_and_electrons(tracks, clusters, pvs):
         MinDigits=2,
         PhotonMinChi2=4.,
         PhotonMinEt=50.0,
+        PrimaryVertices=pvs,
         PhotonCorrection=[
-            CaloFutureECorrection(PrimaryVertices=pvs),
+            CaloFutureECorrection(),
             CaloFutureSCorrection(),
             CaloFutureLCorrection()
         ],
         ElectronCorrection=[
-            CaloFutureECorrection(PrimaryVertices=pvs),
+            CaloFutureECorrection(),
             CaloFutureSCorrection(),
             CaloFutureLCorrection()
         ])
@@ -230,13 +231,14 @@ def make_photons_and_electrons_v3(clusters, matchtable, pvs):
         MinDigits=2,
         PhotonMinChi2=10.,
         PhotonMinEt=50.0,
+        PrimaryVertices=pvs,
         PhotonCorrection=[
-            CaloFutureECorrection(PrimaryVertices=pvs),
+            CaloFutureECorrection(),
             CaloFutureSCorrection(),
             CaloFutureLCorrection()
         ],
         ElectronCorrection=[
-            CaloFutureECorrection(PrimaryVertices=pvs),
+            CaloFutureECorrection(),
             CaloFutureSCorrection(),
             CaloFutureLCorrection()
         ])
@@ -458,8 +460,9 @@ def make_merged_pi0(ecalClusters, pvs):
     mergedPi0 = CaloFutureMergedPi0(
         InputData=ecalClusters,
         EtCut=1500.0,
+        PrimaryVertices=pvs,
         PhotonTools=[
-            CaloFutureECorrection(PrimaryVertices=pvs),
+            CaloFutureECorrection(),
             CaloFutureSCorrection(),
             CaloFutureLCorrection()
         ])
@@ -477,20 +480,24 @@ def make_merged_pi0_various(ecalClusters, pvs):
 
     """
     corrections = [
-        CaloFutureECorrection(PrimaryVertices=pvs),
+        CaloFutureECorrection(),
         CaloFutureSCorrection(),
         CaloFutureLCorrection()
     ]
 
     # default
     mergedPi0 = CaloFutureMergedPi0(
-        InputData=ecalClusters, EtCut=1500.0, PhotonTools=corrections)
+        InputData=ecalClusters,
+        EtCut=1500.0,
+        PrimaryVertices=pvs,
+        PhotonTools=corrections)
 
     # no overlap
     mergedPi0NoOverlap = CaloFutureMergedPi0(
         InputData=ecalClusters,
         EtCut=1500.0,
         MaxIterations=0,
+        PrimaryVertices=pvs,
         PhotonTools=corrections)
 
     # overlap fast (with stopping criteria)
@@ -498,6 +505,7 @@ def make_merged_pi0_various(ecalClusters, pvs):
         InputData=ecalClusters,
         EtCut=1500.0,
         MaxIterations=-25,
+        PrimaryVertices=pvs,
         PhotonTools=corrections)
 
     # overlap without S, L corrections (and also with stopping criteria)
@@ -506,6 +514,7 @@ def make_merged_pi0_various(ecalClusters, pvs):
         EtCut=1500.0,
         ApplyLSCorr=False,
         MaxIterations=-25,
+        PrimaryVertices=pvs,
         PhotonTools=corrections)
 
     return {
@@ -867,6 +876,7 @@ def make_calo_resolution_pi0(best_tracks, pvs, make_raw=default_raw_event):
     pi0NoCor = CaloFutureMergedPi0(
         InputData=clusters["ecalClustersOverlapWithCovar"],
         EtCut=1500.0,
+        PrimaryVertices=pvs,
         PhotonTools=[]).MergedPi0s
 
     return {