Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions PWGCF/Flow/Tasks/flowZdcEnergy.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -44,33 +44,33 @@ using namespace o2::framework::expressions;

namespace o2::aod
{
namespace zdctree
{
DECLARE_SOA_COLUMN(ZNAC, znac, float);
DECLARE_SOA_COLUMN(ZNA1, zna1, float);
DECLARE_SOA_COLUMN(ZNA2, zna2, float);
DECLARE_SOA_COLUMN(ZNA3, zna3, float);
DECLARE_SOA_COLUMN(ZNA4, zna4, float);
DECLARE_SOA_COLUMN(ZNCC, zncc, float);
DECLARE_SOA_COLUMN(ZNC1, znc1, float);
DECLARE_SOA_COLUMN(ZNC2, znc2, float);
DECLARE_SOA_COLUMN(ZNC3, znc3, float);
DECLARE_SOA_COLUMN(ZNC4, znc4, float);
DECLARE_SOA_COLUMN(Multiplicity, multiplicity, float);
}
DECLARE_SOA_TABLE(ZdcTree, "AOD", "ZDCTREE",
zdctree::ZNAC,
zdctree::ZNA1,
zdctree::ZNA2,
zdctree::ZNA3,
zdctree::ZNA4,
zdctree::ZNCC,
zdctree::ZNC1,
zdctree::ZNC2,
zdctree::ZNC3,
zdctree::ZNC4,
zdctree::Multiplicity);
}
namespace zdctree
{
DECLARE_SOA_COLUMN(ZNAC, znac, float);
DECLARE_SOA_COLUMN(ZNA1, zna1, float);
DECLARE_SOA_COLUMN(ZNA2, zna2, float);
DECLARE_SOA_COLUMN(ZNA3, zna3, float);
DECLARE_SOA_COLUMN(ZNA4, zna4, float);
DECLARE_SOA_COLUMN(ZNCC, zncc, float);
DECLARE_SOA_COLUMN(ZNC1, znc1, float);
DECLARE_SOA_COLUMN(ZNC2, znc2, float);
DECLARE_SOA_COLUMN(ZNC3, znc3, float);
DECLARE_SOA_COLUMN(ZNC4, znc4, float);
DECLARE_SOA_COLUMN(Multiplicity, multiplicity, float);
} // namespace zdctree
DECLARE_SOA_TABLE(ZdcTree, "AOD", "ZDCTREE",
zdctree::ZNAC,
zdctree::ZNA1,
zdctree::ZNA2,
zdctree::ZNA3,
zdctree::ZNA4,
zdctree::ZNCC,
zdctree::ZNC1,
zdctree::ZNC2,
zdctree::ZNC3,
zdctree::ZNC4,
zdctree::Multiplicity);
} // namespace o2::aod

#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};

Expand Down Expand Up @@ -236,16 +236,16 @@ struct FlowZdcEnergy {
const float energySectorZNC4 = zdc.energySectorZNC()[3];

zdcTree(energyCommonZNA,
energySectorZNA1,
energySectorZNA2,
energySectorZNA3,
energySectorZNA4,
energyCommonZNC,
energySectorZNC1,
energySectorZNC2,
energySectorZNC3,
energySectorZNC4,
multiTPC);
energySectorZNA1,
energySectorZNA2,
energySectorZNA3,
energySectorZNA4,
energyCommonZNC,
energySectorZNC1,
energySectorZNC2,
energySectorZNC3,
energySectorZNC4,
multiTPC);

const float sumEnergyZNA = energySectorZNA1 + energySectorZNA2 + energySectorZNA3 + energySectorZNA4;
const float sumEnergyZNC = energySectorZNC1 + energySectorZNC2 + energySectorZNC3 + energySectorZNC4;
Expand Down