|
15 | 15 | /// \author Nicolò Jacazio nicolo.jacazio@cern.ch |
16 | 16 | /// |
17 | 17 |
|
18 | | -#include <utility> |
19 | | -#include <vector> |
20 | | -#include <string> |
21 | 18 | #include <map> |
| 19 | +#include <string> |
22 | 20 | #include <unordered_map> |
| 21 | +#include <utility> |
| 22 | +#include <vector> |
23 | 23 |
|
24 | 24 | // O2 includes |
25 | | -#include "Framework/runDataProcessing.h" |
| 25 | +#include "CCDB/BasicCCDBManager.h" |
26 | 26 | #include "Framework/AnalysisTask.h" |
27 | 27 | #include "Framework/HistogramRegistry.h" |
| 28 | +#include "Framework/runDataProcessing.h" |
28 | 29 | #include "ReconstructionDataFormats/Track.h" |
29 | | -#include "CCDB/BasicCCDBManager.h" |
30 | 30 | #include "TOFBase/EventTimeMaker.h" |
31 | 31 |
|
32 | 32 | // O2Physics includes |
33 | | -#include "TableHelper.h" |
34 | | -#include "MetadataHelper.h" |
35 | 33 | #include "CollisionTypeHelper.h" |
| 34 | +#include "MetadataHelper.h" |
| 35 | +#include "TableHelper.h" |
36 | 36 | #include "pidTOFBase.h" |
37 | | -#include "Common/DataModel/TrackSelectionTables.h" |
| 37 | + |
38 | 38 | #include "Common/DataModel/EventSelection.h" |
39 | 39 | #include "Common/DataModel/FT0Corrected.h" |
40 | 40 | #include "Common/DataModel/Multiplicity.h" |
| 41 | +#include "Common/DataModel/TrackSelectionTables.h" |
41 | 42 |
|
42 | 43 | using namespace o2; |
43 | 44 | using namespace o2::framework; |
@@ -924,7 +925,7 @@ struct tofPidMerge { |
924 | 925 | doprocessRun2.value = false; |
925 | 926 | } else { |
926 | 927 | if (mTOFCalibConfig.autoSetProcessFunctions()) { |
927 | | - LOG(info) << "Autodetecting process functions for mass and beta"; |
| 928 | + LOG(info) << "Autodetecting process functions"; |
928 | 929 | if (metadataInfo.isFullyDefined()) { |
929 | 930 | if (metadataInfo.isRun3()) { |
930 | 931 | doprocessRun3.value = true; |
@@ -972,17 +973,24 @@ struct tofPidMerge { |
972 | 973 | doprocessRun2BetaM.value = false; |
973 | 974 | doprocessRun3BetaM.value = false; |
974 | 975 | } else { |
| 976 | + LOG(info) << "Table for TOF beta is " << (enableTableBeta ? "enabled" : "disabled"); |
| 977 | + LOG(info) << "Table for TOF mass is " << (enableTableMass ? "enabled" : "disabled"); |
975 | 978 | if (mTOFCalibConfig.autoSetProcessFunctions()) { |
976 | 979 | LOG(info) << "Autodetecting process functions for mass and beta"; |
977 | | - if (metadataInfo.isFullyDefined()) { |
| 980 | + if (metadataInfo.isInitialized()) { |
978 | 981 | if (metadataInfo.isRun3()) { |
979 | 982 | doprocessRun3BetaM.value = true; |
980 | 983 | doprocessRun2BetaM.value = false; |
981 | 984 | } else { |
982 | 985 | doprocessRun2BetaM.value = true; |
983 | 986 | doprocessRun3BetaM.value = false; |
984 | 987 | } |
| 988 | + } else { |
| 989 | + metadataInfo.print(); |
| 990 | + LOG(warning) << "Metadata is not defined, cannot autodetect process functions for mass and beta"; |
985 | 991 | } |
| 992 | + } else { |
| 993 | + LOG(info) << "Process functions for mass and beta are set manually"; |
986 | 994 | } |
987 | 995 | if (doprocessRun2BetaM && doprocessRun3BetaM) { |
988 | 996 | LOG(fatal) << "Both processRun2BetaM and processRun3BetaM are enabled. Pick one of the two"; |
|
0 commit comments