Merge branch 'xAODPFlow_EDMUpdate_21_9_Dec18_V2' into '21.9'

X aodp flow edm update 21 9 dec18 v2

See merge request atlas/athena!16698

Former-commit-id: 861032aae64f98272e7405dacf0797a58317b1ef

Event/xAOD/xAODPFlow/xAODPFlow/PFODefs.h

@@ -91,6 +91,10 @@ namespace PFODetails
     eflowRec_radiusVectorCellOrdering,
     eflowRec_avgEdensityVectorCellOrdering,
     eflowRec_layerHED,
+    eflowRec_ENG_CALIB_TOT,
+    eflowRec_ENG_CALIB_FRAC_EM,
+    eflowRec_ENG_CALIB_FRAC_HAD,
+    eflowRec_ENG_CALIB_FRAC_REST,
     /* These are all of the DigiTruth attributes */
     eflowRec_ENERGY_DigiHSTruth,
     eflowRec_ETA_DigiHSTruth,

Event/xAOD/xAODPFlow/xAODPFlow/versions/PFOAttributesAccessor_v1.h

@@ -90,11 +90,31 @@ namespace xAOD{
         DEFINE_PFO_ACCESSOR(eflowRec_LAYERENERGY_MINIFCAL1);
         DEFINE_PFO_ACCESSOR(eflowRec_LAYERENERGY_MINIFCAL2);
         DEFINE_PFO_ACCESSOR(eflowRec_LAYERENERGY_MINIFCAL3);
-        DEFINE_PFO_ACCESSOR(eflowRec_layerVectorCellOrdering);
-        DEFINE_PFO_ACCESSOR(eflowRec_radiusVectorCellOrdering);
-        DEFINE_PFO_ACCESSOR(eflowRec_avgEdensityVectorCellOrdering);
-        DEFINE_PFO_ACCESSOR(eflowRec_layerHED);
 	DEFINE_PFO_ACCESSOR(eflowRec_EM_PROBABILITY);
+	DEFINE_PFO_ACCESSOR(eflowRec_layerVectorCellOrdering);
+	DEFINE_PFO_ACCESSOR(eflowRec_radiusVectorCellOrdering);
+	DEFINE_PFO_ACCESSOR(eflowRec_avgEdensityVectorCellOrdering);
+	DEFINE_PFO_ACCESSOR(eflowRec_layerHED);
+	DEFINE_PFO_ACCESSOR(eflowRec_ENG_CALIB_TOT);
+	DEFINE_PFO_ACCESSOR(eflowRec_ENG_CALIB_FRAC_EM);
+	DEFINE_PFO_ACCESSOR(eflowRec_ENG_CALIB_FRAC_HAD);
+	DEFINE_PFO_ACCESSOR(eflowRec_ENG_CALIB_FRAC_REST);
+	DEFINE_PFO_ACCESSOR(eflowRec_ENERGY_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_ETA_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_PHI_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_FIRST_ENG_DENS_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_CENTER_LAMBDA_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_SECOND_R_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_SECOND_LAMBDA_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_ISOLATION_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_ENG_FRAC_MAX_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_ENG_BAD_CELLS_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_N_BAD_CELLS_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_BADLARQ_FRAC_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_ENG_POS_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_SIGNIFICANCE_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_AVG_LAR_Q_DigiHSTruth);
+	DEFINE_PFO_ACCESSOR(eflowRec_AVG_TILE_Q_DigiHSTruth);
 	DEFINE_PFO_ACCESSOR(cellBased_FIRST_ETA); 
 	DEFINE_PFO_ACCESSOR(cellBased_SECOND_R); 
 	DEFINE_PFO_ACCESSOR(cellBased_SECOND_LAMBDA); 
@@ -140,22 +160,6 @@ namespace xAOD{
 	DEFINE_PFO_ACCESSOR(tauShots_signalScore); 
 	DEFINE_PFO_ACCESSOR(tauShots_nPhotons); 
 	DEFINE_PFO_ACCESSOR(tauShots_seedHash);
-  DEFINE_PFO_ACCESSOR(eflowRec_ENERGY_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_ETA_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_PHI_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_FIRST_ENG_DENS_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_CENTER_LAMBDA_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_SECOND_R_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_SECOND_LAMBDA_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_ISOLATION_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_ENG_FRAC_MAX_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_ENG_BAD_CELLS_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_N_BAD_CELLS_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_BADLARQ_FRAC_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_ENG_POS_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_SIGNIFICANCE_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_AVG_LAR_Q_DigiHSTruth);
-  DEFINE_PFO_ACCESSOR(eflowRec_AVG_TILE_Q_DigiHSTruth);
 	default:
 	  std::cerr << "xAOD::PFO_v1 ERROR Unknown float/double variable (" << static_cast<int>(variable) << ") requested" << std::endl;
 	  return 0;