diff --git a/Reconstruction/eflowRec/share/PFlowMTConfig.py b/Reconstruction/eflowRec/share/PFlowMTConfig.py index 6f2782293ca4829965c93fc1a61bc0efc52e379b..899a6296b80f094db9624814dc4f1c16b737430e 100644 --- a/Reconstruction/eflowRec/share/PFlowMTConfig.py +++ b/Reconstruction/eflowRec/share/PFlowMTConfig.py @@ -250,8 +250,12 @@ if jobproperties.eflowRecFlags.usePFEGammaPFOAssoc: PFEGammaPFOAssoc=PFEGammaPFOAssoc("PFEGammaPFOAssoc") topSequence += PFEGammaPFOAssoc -#Add new FlowElement creator +#Add new FlowElement creators from eflowRec.eflowRecConf import PFChargedFlowElementCreatorAlgorithm PFChargedFlowElementCreatorAlgorithm = PFChargedFlowElementCreatorAlgorithm("PFChargedFlowElementCreatorAlgorithm") topSequence += PFChargedFlowElementCreatorAlgorithm +from eflowRec.eflowRecConf import PFNeutralFlowElementCreatorAlgorithm +PFNeutralFlowElementCreatorAlgorithm = PFNeutralFlowElementCreatorAlgorithm("PFNeutralFlowElementCreatorAlgorithm") +topSequence += PFNeutralFlowElementCreatorAlgorithm + diff --git a/Reconstruction/eflowRec/share/eflowRecAODList.py b/Reconstruction/eflowRec/share/eflowRecAODList.py index d1f63a3448563e6f859ecb820906c2627cd1e3e8..e2928085636f244bc67883bd51fdb76f58fc0115 100644 --- a/Reconstruction/eflowRec/share/eflowRecAODList.py +++ b/Reconstruction/eflowRec/share/eflowRecAODList.py @@ -23,4 +23,7 @@ if True == jobproperties.eflowRecFlags.provideShowerSubtractedClusters: #Add new flow elements eflowRecAODList += [ "xAOD::FlowElementContainer#JetETMissChargedFlowElements"] -eflowRecAODList += [ "xAOD::FlowElementAuxContainer#JetETMissChargedFlowElementsAux."] \ No newline at end of file +eflowRecAODList += [ "xAOD::FlowElementAuxContainer#JetETMissChargedFlowElementsAux."] + +eflowRecAODList += [ "xAOD::FlowElementContainer#JetETMissNeutralFlowElements"] +eflowRecAODList += [ "xAOD::FlowElementAuxContainer#JetETMissNeutralFlowElementsAux."] \ No newline at end of file diff --git a/Reconstruction/eflowRec/share/eflowRecESDList.py b/Reconstruction/eflowRec/share/eflowRecESDList.py index 227588d739f5caf40682ed761843c1d0e2a66227..33b7d283111e1be9d73a9b8615df9b5dd58218e7 100644 --- a/Reconstruction/eflowRec/share/eflowRecESDList.py +++ b/Reconstruction/eflowRec/share/eflowRecESDList.py @@ -21,3 +21,9 @@ if True == jobproperties.eflowRecFlags.provideShowerSubtractedClusters: eflowRecESDList += [ "xAOD::CaloClusterContainer#PFCaloCluster"] eflowRecESDList += [ "xAOD::CaloClusterAuxContainer#PFCaloClusterAux."] +#Add new flow elements +eflowRecAODList += [ "xAOD::FlowElementContainer#JetETMissChargedFlowElements"] +eflowRecAODList += [ "xAOD::FlowElementAuxContainer#JetETMissChargedFlowElementsAux."] + +eflowRecAODList += [ "xAOD::FlowElementContainer#JetETMissNeutralFlowElements"] +eflowRecAODList += [ "xAOD::FlowElementAuxContainer#JetETMissNeutralFlowElementsAux."] \ No newline at end of file diff --git a/Reconstruction/eflowRec/src/PFNeutralFlowElementCreatorAlgorithm.cxx b/Reconstruction/eflowRec/src/PFNeutralFlowElementCreatorAlgorithm.cxx index 5ecdd6abbb55bafa8231caf06572690a73815530..893c83be12eb0257456359abd7c70d2316ba2383 100644 --- a/Reconstruction/eflowRec/src/PFNeutralFlowElementCreatorAlgorithm.cxx +++ b/Reconstruction/eflowRec/src/PFNeutralFlowElementCreatorAlgorithm.cxx @@ -120,6 +120,13 @@ StatusCode PFNeutralFlowElementCreatorAlgorithm::createNeutralFlowElement(const this->addMoment(xAOD::CaloCluster::ISOLATION,"eflowRec_ISOLATION",*cluster,*thisFE); this->addMoment(xAOD::CaloCluster::SECOND_LAMBDA,"eflowRec_SECOND_LAMBDA",*cluster,*thisFE); this->addMoment(xAOD::CaloCluster::EM_PROBABILITY,"eflowRec_EM_PROBABILITY",*cluster,*thisFE); + + if (m_useCalibHitTruth){ + this->addMoment(xAOD::CaloCluster::ENG_CALIB_TOT,"eflowRec_ENG_CALIB_TOT",*cluster,*thisFE); + this->addMoment(xAOD::CaloCluster::ENG_CALIB_FRAC_EM,"eflowRec_ENG_CALIB_FRAC_EM",*cluster,*thisFE); + this->addMoment(xAOD::CaloCluster::ENG_CALIB_FRAC_HAD,"eflowRec_ENG_CALIB_FRAC_HAD",*cluster,*thisFE); + this->addMoment(xAOD::CaloCluster::ENG_CALIB_FRAC_REST,"eflowRec_ENG_CALIB_FRAC_REST",*cluster,*thisFE); + } }//cluster loop return StatusCode::SUCCESS;