Adding Clusters to JETM4, Adding PFO info to JETM3,4,5, Adding vz to the ChargedPFO aux info.

Former-commit-id: af918aa761d2f7a1f975a23845f4c47ff89118b3

PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py

@@ -204,6 +204,12 @@ if DerivationFrameworkIsMonteCarlo:
     addJetPtAssociation(jetalg="AntiKt4EMTopoLowPt",  truthjetalg="AntiKt4TruthJets", sequence=jetm3Seq, algname="JetPtAssociationAlgLowPt")
     addJetPtAssociation(jetalg="AntiKt4LCTopoLowPt",  truthjetalg="AntiKt4TruthJets", sequence=jetm3Seq, algname="JetPtAssociationAlgLowPt")
 
+#====================================================================
+# ADD PFLOW AUG INFORMATION 
+#====================================================================
+from DerivationFrameworkJetEtMiss.PFlowCommon import applyPFOAugmentation
+applyPFOAugmentation(DerivationFrameworkJob)
+
 #====================================================================
 # Add the containers to the output stream - slimming done here
 #====================================================================

PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py

@@ -165,6 +165,12 @@ if DerivationFrameworkIsMonteCarlo:
 
 addCSSKSoftDropJets(jetm4Seq, "JETM4")
 
+#====================================================================
+# ADD PFLOW AUG INFORMATION 
+#====================================================================
+from DerivationFrameworkJetEtMiss.PFlowCommon import applyPFOAugmentation
+applyPFOAugmentation(DerivationFrameworkJob)
+
 #=======================================
 # SCHEDULE CUSTOM MET RECONSTRUCTION
 #=======================================
@@ -197,7 +203,9 @@ JETM4SlimmingHelper.AllVariables = [# "CaloCalTopoClusters",
                                     "MuonSegments",
                                     "Kt4EMTopoOriginEventShape","Kt4LCTopoOriginEventShape","Kt4EMPFlowEventShape",
                                     ]
-JETM4SlimmingHelper.ExtraVariables = ["Photons."+NewTrigVars["Photons"]]
+JETM4SlimmingHelper.ExtraVariables = ["CaloCalTopoClusters.calE.calEta.calPhi.calM.rawE.rawEta.rawPhi.rawM","Photons."+NewTrigVars["Photons"],"JetETMissNeutralParticleFlowObjects.m.mEM.eflowRec_TIMING.eflowRec_AVG_LAR_Q.eflowRec_CENTER_LAMBDA.pt.ptEM.phi.eta",
+"JetETMissChargedParticleFlowObjects.pt.eta.phi.m.eflowRec_tracksExpectedEnergyDeposit.charge.eflowRec_isInDenseEnvironment.pfo_TrackLinks.DFCommonPFlow_z0.DFCommonPFlow_vz.DFCommonPFlow_d0.DFCommonPFlow_theta.DFCommonPFlow_envWeight"]
+
 for truthc in [
     "TruthMuons",
     "TruthElectrons",

PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py

@@ -133,7 +133,7 @@ JETM5SlimmingHelper.AllVariables = ["CaloCalTopoClusters",
                                     "Kt4EMTopoOriginEventShape","Kt4LCTopoOriginEventShape","Kt4EMPFlowEventShape",
                                     ]
 JETM5SlimmingHelper.ExtraVariables = ["JetETMissNeutralParticleFlowObjects.m.mEM.pfo_TrackLinks.eflowRec_ISOLATION.pfo_ClusterLinks.eflowRec_TIMING.eflowRec_AVG_LAR_Q.eflowRec_EM_PROBABILITY.eflowRec_CENTER_LAMBDA.centerMag.pt.ptEM.phi.eta",
-"JetETMissChargedParticleFlowObjects.pt.eta.phi.m.eflowRec_tracksExpectedEnergyDeposit.pfo_vertex.charge.eflowRec_isInDenseEnvironment.pfo_TrackLinks.DFCommonPFlow_z0.DFCommonPFlow_d0.DFCommonPFlow_theta.DFCommonPFlow_envWeight",]
+"JetETMissChargedParticleFlowObjects.pt.eta.phi.m.eflowRec_tracksExpectedEnergyDeposit.pfo_vertex.charge.eflowRec_isInDenseEnvironment.pfo_TrackLinks.DFCommonPFlow_z0.DFCommonPFlow_vz.DFCommonPFlow_d0.DFCommonPFlow_theta.DFCommonPFlow_envWeight",]
 
 for truthc in [
     "TruthMuons",

PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/PFlowAugmentationTool.cxx

@@ -16,6 +16,7 @@ namespace DerivationFramework {
 const static SG::AuxElement::Decorator<char> dec_PVmatched("DFCommonPFlow_PVMatched");
 const static SG::AuxElement::Decorator<float> dec_corrP4_pt("DFCommonPFlow_CaloCorrectedPt");
 const static SG::AuxElement::Decorator<float> dec_z0("DFCommonPFlow_z0");
+const static SG::AuxElement::Decorator<float> dec_vz("DFCommonPFlow_vz");
 const static SG::AuxElement::Decorator<float> dec_d0("DFCommonPFlow_d0");
 const static SG::AuxElement::Decorator<float> dec_theta("DFCommonPFlow_theta");
 const static SG::AuxElement::Decorator<float> dec_envWeight("DFCommonPFlow_envWeight");
@@ -90,6 +91,7 @@ const static SG::AuxElement::Decorator<float> dec_envWeight("DFCommonPFlow_envWe
 
       // decorate the track properties	
       dec_z0(*cpfo) = ptrk->z0();
+      dec_vz(*cpfo) = ptrk->vz();
       dec_d0(*cpfo) = ptrk->d0();
       dec_theta(*cpfo) = ptrk->theta();