Bug fixes to phys val job options.

Set signal types of charged FlowElements.

PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValPFlow_jobOptions.py

@@ -15,7 +15,11 @@ PhysValPFO_neutral_EM = PhysValPFO("PhysValPFO_neutral")
 PhysValPFO_neutral_EM.OutputLevel = WARNING
 PhysValPFO_neutral_EM.DetailLevel = 10
 PhysValPFO_neutral_EM.EnableLumi = False
-PhysValPFO_neutral_EM.PFOContainerName="JetETMissNeutralParticleFlowObjects";
+PhysValPFO_neutral_EM.PFOContainerName="JetETMissNeutralParticleFlowObjects"
 PhysValPFO_neutral_EM.useNeutralPFO = True
 
 monMan.AthenaMonTools += [ PhysValPFO_neutral_EM ]
+
+from PFODQA.PFODQAConf import PhysValFlowElement
+PhysValFlowElement = PhysValFlowElement("PhysValFlowElement_Charged")
+monMan.AthenaMonTools += [PhysValFlowElement]

Reconstruction/eflowRec/src/PFChargedFlowElementCreatorAlgorithm.cxx

@@ -52,8 +52,9 @@ void PFChargedFlowElementCreatorAlgorithm::createChargedFlowElements(const eflow
       if (!efRecTrack->isSubtracted()){ continue; }
     }
 
-    /* Create new xAOD::FlowElement */
+    /* Create new xAOD::FlowElement and set the type to charged PFlow */
     xAOD::FlowElement* thisFE = new xAOD::FlowElement();
+    thisFE->setSignalType(xAOD::FlowElement::SignalType::ChargedPFlow);
     chargedFlowElementContainerWriteHandle->push_back(thisFE);
 
     /* Get the track elementLink and add it to the xAOD:FE. 
@@ -68,6 +69,22 @@ void PFChargedFlowElementCreatorAlgorithm::createChargedFlowElements(const eflow
     //Now set the charge
     thisFE->setCharge(efRecTrack->getTrack()->charge());
 
+    std::pair<double,double> etaPhi(0.0,0.0);
+
+    if (m_eOverPMode){
+      /* In EOverPMode want charged eflowObjects to have extrapolated eta,phi as coordinates
+       * (needed for analysis of EOverP Data) */
+      etaPhi = efRecTrack->getTrackCaloPoints().getEM2etaPhi();
+        
+    } else {
+      /* In normal mode we want the track eta,phi at the perigee */
+      etaPhi.first = efRecTrack->getTrack()->eta();
+      etaPhi.second = efRecTrack->getTrack()->phi();
+    }
+
+    /* Set the 4-vector of the xAOD::PFO */
+    thisFE->setP4(efRecTrack->getTrack()->pt(), etaPhi.first, etaPhi.second, efRecTrack->getTrack()->m());
+
   }//loop over eflowRecTracks
 
 }