Skip to content

Commit b72eebc

Browse files
author
David Dobrigkeit Chinellato
committed
Add comments
1 parent b1de32a commit b72eebc

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎Framework/Core/include/Framework/AnalysisDataModel.h‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#ifndef O2_FRAMEWORK_ANALYSISDATAMODEL_H_
1212
#define O2_FRAMEWORK_ANALYSISDATAMODEL_H_
1313

14-
// #define O2_ZDC_NEWDATAMODEL
14+
// #define O2_ZDC_NEWDATAMODEL -> commented for now
1515

1616
#include "Framework/ASoA.h"
1717
#include <cmath>
@@ -740,7 +740,7 @@ DECLARE_SOA_COLUMN(Amplitude, amplitude, std::vector<float>); //! Amplitudes of
740740
DECLARE_SOA_COLUMN(Time, time, std::vector<float>); //! Times of non-zero channels. The channel IDs are given in ChannelT (at the same index)
741741
DECLARE_SOA_COLUMN(ChannelT, channelT, std::vector<uint8_t>); //! Channel IDs which had non-zero amplitudes. There are at maximum 26 channels.
742742
// Dynamic columns to take into account packed information; replace old getters
743-
DECLARE_SOA_DYNAMIC_COLUMN(EnergyZEM1, energyZEM1, //!
743+
DECLARE_SOA_DYNAMIC_COLUMN(EnergyZEM1, energyZEM1, //! return ZEM1 energy
744744
[](gsl::span<const uint8_t> channelE, gsl::span<const float> energy) -> float {
745745
auto ne = channelE.size();
746746
auto thisenergy = -std::numeric_limits<float>::infinity();
@@ -752,7 +752,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(EnergyZEM1, energyZEM1, //!
752752
}
753753
return thisenergy;
754754
});
755-
DECLARE_SOA_DYNAMIC_COLUMN(EnergyZEM2, energyZEM2, //!
755+
DECLARE_SOA_DYNAMIC_COLUMN(EnergyZEM2, energyZEM2, //! return ZEM2 energy
756756
[](gsl::span<const uint8_t> channelE, gsl::span<const float> energy) -> float {
757757
auto thisenergy = -std::numeric_limits<float>::infinity();
758758
for (uint64_t ie = 0; ie < channelE.size(); ie++) {
@@ -763,7 +763,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(EnergyZEM2, energyZEM2, //!
763763
}
764764
return thisenergy;
765765
});
766-
DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZNA, energyCommonZNA, //!
766+
DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZNA, energyCommonZNA, //! return common ZNA energy
767767
[](gsl::span<const uint8_t> channelE, gsl::span<const float> energy) -> float {
768768
auto thisenergy = -std::numeric_limits<float>::infinity();
769769
for (uint64_t ie = 0; ie < channelE.size(); ie++) {
@@ -774,7 +774,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZNA, energyCommonZNA, //!
774774
}
775775
return thisenergy;
776776
});
777-
DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZNC, energyCommonZNC, //!
777+
DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZNC, energyCommonZNC, //! return common ZNC energy
778778
[](gsl::span<const uint8_t> channelE, gsl::span<const float> energy) -> float {
779779
auto thisenergy = -std::numeric_limits<float>::infinity();
780780
for (uint64_t ie = 0; ie < channelE.size(); ie++) {
@@ -785,7 +785,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZNC, energyCommonZNC, //!
785785
}
786786
return thisenergy;
787787
});
788-
DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZPA, energyCommonZPA, //!
788+
DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZPA, energyCommonZPA, //! return common ZPA energy
789789
[](gsl::span<const uint8_t> channelE, gsl::span<const float> energy) -> float {
790790
auto thisenergy = -std::numeric_limits<float>::infinity();
791791
for (uint64_t ie = 0; ie < channelE.size(); ie++) {
@@ -796,7 +796,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZPA, energyCommonZPA, //!
796796
}
797797
return thisenergy;
798798
});
799-
DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZPC, energyCommonZPC, //!
799+
DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZPC, energyCommonZPC, //! return common ZPC energy
800800
[](gsl::span<const uint8_t> channelE, gsl::span<const float> energy) -> float {
801801
auto thisenergy = -std::numeric_limits<float>::infinity();
802802
for (uint64_t ie = 0; ie < channelE.size(); ie++) {
@@ -807,7 +807,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZPC, energyCommonZPC, //!
807807
}
808808
return thisenergy;
809809
});
810-
DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZNA, energySectorZNA, //!
810+
DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZNA, energySectorZNA, //! return sector ZNA energy (array of 4 floats)
811811
[](gsl::span<const uint8_t> channelE, gsl::span<const float> energy) -> std::array<float, 4> {
812812
std::array<float, 4> thisenergy = {
813813
-std::numeric_limits<float>::infinity(),
@@ -826,7 +826,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZNA, energySectorZNA, //!
826826
}
827827
return thisenergy;
828828
});
829-
DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZNC, energySectorZNC, //!
829+
DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZNC, energySectorZNC, //! return sector ZNC energy (array of 4 floats)
830830
[](gsl::span<const uint8_t> channelE, gsl::span<const float> energy) -> std::array<float, 4> {
831831
std::array<float, 4> thisenergy = {
832832
-std::numeric_limits<float>::infinity(),
@@ -845,7 +845,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZNC, energySectorZNC, //!
845845
}
846846
return thisenergy;
847847
});
848-
DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZPA, energySectorZPA, //!
848+
DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZPA, energySectorZPA, //! return sector ZPA energy (array of 4 floats)
849849
[](gsl::span<const uint8_t> channelE, gsl::span<const float> energy) -> std::array<float, 4> {
850850
std::array<float, 4> thisenergy = {
851851
-std::numeric_limits<float>::infinity(),
@@ -864,7 +864,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZPA, energySectorZPA, //!
864864
}
865865
return thisenergy;
866866
});
867-
DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZPC, energySectorZPC, //!
867+
DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZPC, energySectorZPC, //! return sector ZPC energy (array of 4 floats)
868868
[](gsl::span<const uint8_t> channelE, gsl::span<const float> energy) -> std::array<float, 4> {
869869
std::array<float, 4> thisenergy = {
870870
-std::numeric_limits<float>::infinity(),
@@ -883,7 +883,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(EnergySectorZPC, energySectorZPC, //!
883883
}
884884
return thisenergy;
885885
});
886-
DECLARE_SOA_DYNAMIC_COLUMN(TimeZEM1, timeZEM1, //!
886+
DECLARE_SOA_DYNAMIC_COLUMN(TimeZEM1, timeZEM1, //! return ZEM1 time information
887887
[](gsl::span<const uint8_t> channelT, gsl::span<const float> time) -> float {
888888
auto thistime = -std::numeric_limits<float>::infinity();
889889
for (uint64_t ie = 0; ie < channelT.size(); ie++) {
@@ -894,7 +894,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(TimeZEM1, timeZEM1, //!
894894
}
895895
return thistime;
896896
});
897-
DECLARE_SOA_DYNAMIC_COLUMN(TimeZEM2, timeZEM2, //!
897+
DECLARE_SOA_DYNAMIC_COLUMN(TimeZEM2, timeZEM2, //! return ZEM2 time information
898898
[](gsl::span<const uint8_t> channelT, gsl::span<const float> time) -> float {
899899
auto thistime = -std::numeric_limits<float>::infinity();
900900
for (uint64_t ie = 0; ie < channelT.size(); ie++) {
@@ -905,7 +905,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(TimeZEM2, timeZEM2, //!
905905
}
906906
return thistime;
907907
});
908-
DECLARE_SOA_DYNAMIC_COLUMN(TimeZNA, timeZNA, //!
908+
DECLARE_SOA_DYNAMIC_COLUMN(TimeZNA, timeZNA, //! return ZNA time information
909909
[](gsl::span<const uint8_t> channelT, gsl::span<const float> time) -> float {
910910
auto thistime = -std::numeric_limits<float>::infinity();
911911
for (uint64_t ie = 0; ie < channelT.size(); ie++) {
@@ -916,7 +916,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(TimeZNA, timeZNA, //!
916916
}
917917
return thistime;
918918
});
919-
DECLARE_SOA_DYNAMIC_COLUMN(TimeZNC, timeZNC, //!
919+
DECLARE_SOA_DYNAMIC_COLUMN(TimeZNC, timeZNC, //! return ZNC time information
920920
[](gsl::span<const uint8_t> channelT, gsl::span<const float> time) -> float {
921921
auto thistime = -std::numeric_limits<float>::infinity();
922922
for (uint64_t ie = 0; ie < channelT.size(); ie++) {
@@ -927,7 +927,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(TimeZNC, timeZNC, //!
927927
}
928928
return thistime;
929929
});
930-
DECLARE_SOA_DYNAMIC_COLUMN(TimeZPA, timeZPA, //!
930+
DECLARE_SOA_DYNAMIC_COLUMN(TimeZPA, timeZPA, //! return ZPA time information
931931
[](gsl::span<const uint8_t> channelT, gsl::span<const float> time) -> float {
932932
auto thistime = -std::numeric_limits<float>::infinity();
933933
for (uint64_t ie = 0; ie < channelT.size(); ie++) {
@@ -938,7 +938,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(TimeZPA, timeZPA, //!
938938
}
939939
return thistime;
940940
});
941-
DECLARE_SOA_DYNAMIC_COLUMN(TimeZPC, timeZPC, //!
941+
DECLARE_SOA_DYNAMIC_COLUMN(TimeZPC, timeZPC, //! return ZPC time information
942942
[](gsl::span<const uint8_t> channelT, gsl::span<const float> time) -> float {
943943
auto thistime = -std::numeric_limits<float>::infinity();
944944
for (uint64_t ie = 0; ie < channelT.size(); ie++) {
@@ -950,7 +950,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(TimeZPC, timeZPC, //!
950950
return thistime;
951951
});
952952

953-
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZEM1, amplitudeZEM1, //!
953+
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZEM1, amplitudeZEM1, //! return ZEM1 amplitude
954954
[](gsl::span<const uint8_t> channelT, gsl::span<const float> amplitude) -> float {
955955
auto thisamplitude = -std::numeric_limits<float>::infinity();
956956
for (uint64_t ie = 0; ie < channelT.size(); ie++) {
@@ -961,7 +961,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZEM1, amplitudeZEM1, //!
961961
}
962962
return thisamplitude;
963963
});
964-
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZEM2, amplitudeZEM2, //!
964+
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZEM2, amplitudeZEM2, //! return ZEM2 amplitude
965965
[](gsl::span<const uint8_t> channelT, gsl::span<const float> amplitude) -> float {
966966
auto thisamplitude = -std::numeric_limits<float>::infinity();
967967
for (uint64_t ie = 0; ie < channelT.size(); ie++) {
@@ -972,7 +972,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZEM2, amplitudeZEM2, //!
972972
}
973973
return thisamplitude;
974974
});
975-
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZNA, amplitudeZNA, //!
975+
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZNA, amplitudeZNA, //! return ZNA amplitude
976976
[](gsl::span<const uint8_t> channelT, gsl::span<const float> amplitude) -> float {
977977
auto thisamplitude = -std::numeric_limits<float>::infinity();
978978
for (uint64_t ie = 0; ie < channelT.size(); ie++) {
@@ -983,7 +983,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZNA, amplitudeZNA, //!
983983
}
984984
return thisamplitude;
985985
});
986-
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZNC, amplitudeZNC, //!
986+
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZNC, amplitudeZNC, //! return ZNC amplitude
987987
[](gsl::span<const uint8_t> channelT, gsl::span<const float> amplitude) -> float {
988988
auto thisamplitude = -std::numeric_limits<float>::infinity();
989989
for (uint64_t ie = 0; ie < channelT.size(); ie++) {
@@ -994,7 +994,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZNC, amplitudeZNC, //!
994994
}
995995
return thisamplitude;
996996
});
997-
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZPA, amplitudeZPA, //!
997+
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZPA, amplitudeZPA, //! return ZPA amplitude
998998
[](gsl::span<const uint8_t> channelT, gsl::span<const float> amplitude) -> float {
999999
auto thisamplitude = -std::numeric_limits<float>::infinity();
10001000
for (uint64_t ie = 0; ie < channelT.size(); ie++) {
@@ -1005,7 +1005,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZPA, amplitudeZPA, //!
10051005
}
10061006
return thisamplitude;
10071007
});
1008-
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZPC, amplitudeZPC, //!
1008+
DECLARE_SOA_DYNAMIC_COLUMN(AmplitudeZPC, amplitudeZPC, //! return ZPC amplitude
10091009
[](gsl::span<const uint8_t> channelT, gsl::span<const float> amplitude) -> float {
10101010
auto thisamplitude = -std::numeric_limits<float>::infinity();
10111011
for (uint64_t ie = 0; ie < channelT.size(); ie++) {

0 commit comments

Comments
 (0)