@@ -96,14 +96,14 @@ DECLARE_SOA_COLUMN(StoredM02, storedM02, int16_t); //! shower shape
9696DECLARE_SOA_COLUMN (StoredTime, storedTime, int16_t ); // ! cluster time (10 ps resolution)
9797DECLARE_SOA_COLUMN (StoredIsExotic, storedIsExotic, bool ); // ! flag to mark cluster as exotic
9898
99- DECLARE_SOA_DYNAMIC_COLUMN (Definition, definition, [](int8_t storedDefinition) -> int8_t { return storedDefinition; }); // ! cluster definition, see EMCALClusterDefinition.h
100- DECLARE_SOA_DYNAMIC_COLUMN (E, e, [](int16_t storedE) -> float { return storedE / emdownscaling::downscalingFactors[emdownscaling::kEnergy ]; }); // ! cluster energy (GeV)
101- DECLARE_SOA_DYNAMIC_COLUMN (Eta, eta, [](int16_t storedEta) -> float { return storedEta / emdownscaling::downscalingFactors[emdownscaling::kEta ]; }); // ! cluster pseudorapidity
102- DECLARE_SOA_DYNAMIC_COLUMN (Phi, phi, [](uint16_t storedPhi) -> float { return storedPhi / emdownscaling::downscalingFactors[emdownscaling::kPhi ]; }); // ! cluster azimuthal angle (0 to 2pi)
103- DECLARE_SOA_DYNAMIC_COLUMN (NCells, nCells, [](int16_t storedNCells) -> int16_t { return storedNCells; }); // ! number of cells in cluster
104- DECLARE_SOA_DYNAMIC_COLUMN (M02, m02, [](int16_t storedM02) -> float { return storedM02 / emdownscaling::downscalingFactors[emdownscaling::kM02 ]; }); // ! shower shape long axis
105- DECLARE_SOA_DYNAMIC_COLUMN (Time, time, [](int16_t storedTime) -> float { return storedTime / emdownscaling::downscalingFactors[emdownscaling::kTime ]; }); // ! cluster time (ns)
106- DECLARE_SOA_DYNAMIC_COLUMN (IsExotic, isExotic, [](bool storedIsExotic) -> bool { return storedIsExotic; }); // ! flag to mark cluster as exotic
99+ DECLARE_SOA_DYNAMIC_COLUMN (Definition, definition, [](int8_t storedDefinition) -> int8_t { return storedDefinition; }); // ! cluster definition, see EMCALClusterDefinition.h
100+ DECLARE_SOA_DYNAMIC_COLUMN (E, e, [](int16_t storedE) -> float { return storedE / emdownscaling::downscalingFactors[emdownscaling::kEnergy ] + std::numeric_limits< float >:: epsilon () ; }); // ! cluster energy (GeV)
101+ DECLARE_SOA_DYNAMIC_COLUMN (Eta, eta, [](int16_t storedEta) -> float { return storedEta / emdownscaling::downscalingFactors[emdownscaling::kEta ] + std::numeric_limits< float >:: epsilon () ; }); // ! cluster pseudorapidity
102+ DECLARE_SOA_DYNAMIC_COLUMN (Phi, phi, [](uint16_t storedPhi) -> float { return storedPhi / emdownscaling::downscalingFactors[emdownscaling::kPhi ] + std::numeric_limits< float >:: epsilon () ; }); // ! cluster azimuthal angle (0 to 2pi)
103+ DECLARE_SOA_DYNAMIC_COLUMN (NCells, nCells, [](int16_t storedNCells) -> int16_t { return storedNCells; }); // ! number of cells in cluster
104+ DECLARE_SOA_DYNAMIC_COLUMN (M02, m02, [](int16_t storedM02) -> float { return storedM02 / emdownscaling::downscalingFactors[emdownscaling::kM02 ] + std::numeric_limits< float >:: epsilon () ; }); // ! shower shape long axis
105+ DECLARE_SOA_DYNAMIC_COLUMN (Time, time, [](int16_t storedTime) -> float { return storedTime / emdownscaling::downscalingFactors[emdownscaling::kTime ] + std::numeric_limits< float >:: epsilon () ; }); // ! cluster time (ns)
106+ DECLARE_SOA_DYNAMIC_COLUMN (IsExotic, isExotic, [](bool storedIsExotic) -> bool { return storedIsExotic; }); // ! flag to mark cluster as exotic
107107
108108DECLARE_SOA_DYNAMIC_COLUMN (Pt, pt, [](float storedE, float storedEta) -> float { return storedE / emdownscaling::downscalingFactors[emdownscaling::kEnergy ] / std::cosh (storedEta / emdownscaling::downscalingFactors[emdownscaling::kEta ]); }); // ! cluster pt, assuming m=0 (photons)
109109} // namespace bcwisecluster
@@ -120,7 +120,7 @@ DECLARE_SOA_COLUMN(IsAccepted, isAccepted, bool); //! Both decay photons are wit
120120DECLARE_SOA_COLUMN (IsPrimary, isPrimary, bool ); // ! mcParticle.isPhysicalPrimary() || mcParticle.producedByGenerator()
121121DECLARE_SOA_COLUMN (IsFromWD, isFromWD, bool ); // ! Pi0 from a weak decay according to pwgem::photonmeson::utils::mcutil::IsFromWD
122122
123- DECLARE_SOA_DYNAMIC_COLUMN (Pt, pt, [](uint16_t storedpt) -> float { return storedpt / emdownscaling::downscalingFactors[emdownscaling::kpT]; }); // ! pT of pi0 (GeV)
123+ DECLARE_SOA_DYNAMIC_COLUMN (Pt, pt, [](uint16_t storedpt) -> float { return storedpt / emdownscaling::downscalingFactors[emdownscaling::kpT] + std::numeric_limits< float >:: epsilon () ; }); // ! pT of pi0 (GeV)
124124} // namespace bcwisemcpi0s
125125
126126DECLARE_SOA_TABLE (BCWiseMCPi0s, " AOD" , " BCWISEMCPI0" , // ! table of pi0s on MC level
@@ -132,7 +132,7 @@ namespace bcwisemccluster
132132DECLARE_SOA_COLUMN (Pi0ID, pi0ID, int32_t ); // ! Index of the mother pi0 (-1 if not from pi0)
133133DECLARE_SOA_COLUMN (StoredTrueE, storedTrueE, uint16_t ); // ! energy of cluster inducing particle (1 MeV -> Maximum cluster energy of ~65 GeV)
134134
135- DECLARE_SOA_DYNAMIC_COLUMN (TrueE, trueE, [](uint16_t storedTrueE) -> float { return storedTrueE / emdownscaling::downscalingFactors[emdownscaling::kEnergy ]; }); // ! energy of cluster inducing particle (GeV)
135+ DECLARE_SOA_DYNAMIC_COLUMN (TrueE, trueE, [](uint16_t storedTrueE) -> float { return storedTrueE / emdownscaling::downscalingFactors[emdownscaling::kEnergy ] + std::numeric_limits< float >:: epsilon () ; }); // ! energy of cluster inducing particle (GeV)
136136} // namespace bcwisemccluster
137137
138138DECLARE_SOA_TABLE (BCWiseMCClusters, " AOD" , " BCWISEMCCLS" , // ! table of MC information for clusters -> To be joined with the cluster table
0 commit comments