Skip to content

Commit 9f5c88d

Browse files
sandor-lokossandor-lokos
committed
Converter implemented for FITbit tables version 000 to 001; bug fix in the new FITbit table; formatting issues fixed
1 parent 753b84c commit 9f5c88d

5 files changed

Lines changed: 36 additions & 35 deletions

File tree

‎PWGUD/DataModel/UDTables.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -424,28 +424,28 @@ DECLARE_SOA_COLUMN(Thr2W3, thr2W3, uint64_t); /// 2 MIP thresholds for FT0C ch 9
424424
} // namespace udcollfitbits
425425

426426
DECLARE_SOA_TABLE(UDCollisionFITBits_000, "AOD", "UDCOLLFITBITS",
427-
o2::soa::Index<>,
428-
udcollfitbits::Thr1W0, /// 1 MIP thresholds for FT0A ch 0 - ch 63
429-
udcollfitbits::Thr1W1, /// 1 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
430-
udcollfitbits::Thr1W2, /// 1 MIP thresholds for FT0C ch 32 - ch 96
431-
udcollfitbits::Thr1W3, /// 1 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
432-
udcollfitbits::Thr2W0, /// 2 MIP thresholds for FT0A ch 0 - ch 63
433-
udcollfitbits::Thr2W1, /// 2 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
434-
udcollfitbits::Thr2W2, /// 2 MIP thresholds for FT0C ch 32 - ch 96
435-
udcollfitbits::Thr2W3 /// 2 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
427+
o2::soa::Index<>,
428+
udcollfitbits::Thr1W0, /// 1 MIP thresholds for FT0A ch 0 - ch 63
429+
udcollfitbits::Thr1W1, /// 1 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
430+
udcollfitbits::Thr1W2, /// 1 MIP thresholds for FT0C ch 32 - ch 96
431+
udcollfitbits::Thr1W3, /// 1 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
432+
udcollfitbits::Thr2W0, /// 2 MIP thresholds for FT0A ch 0 - ch 63
433+
udcollfitbits::Thr2W1, /// 2 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
434+
udcollfitbits::Thr2W2, /// 2 MIP thresholds for FT0C ch 32 - ch 96
435+
udcollfitbits::Thr2W3 /// 2 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
436436
);
437437

438438
DECLARE_SOA_TABLE_VERSIONED(UDCollisionFITBits_001, "AOD", "UDCOLLFITBITS", 1,
439-
o2::soa::Index<>,
440-
udcollfitbits::UDCollisionId, /// Link to the UDCOLLISION table <---- EXTRA
441-
udcollfitbits::Thr1W0, /// 1 MIP thresholds for FT0A ch 0 - ch 63
442-
udcollfitbits::Thr1W1, /// 1 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
443-
udcollfitbits::Thr1W2, /// 1 MIP thresholds for FT0C ch 32 - ch 96
444-
udcollfitbits::Thr1W3, /// 1 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
445-
udcollfitbits::Thr2W0, /// 2 MIP thresholds for FT0A ch 0 - ch 63
446-
udcollfitbits::Thr2W1, /// 2 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
447-
udcollfitbits::Thr2W2, /// 2 MIP thresholds for FT0C ch 32 - ch 96
448-
udcollfitbits::Thr2W3 /// 2 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
439+
o2::soa::Index<>,
440+
udcollfitbits::UDCollisionId, /// Link to the UDCOLLISION table <---- EXTRA
441+
udcollfitbits::Thr1W0, /// 1 MIP thresholds for FT0A ch 0 - ch 63
442+
udcollfitbits::Thr1W1, /// 1 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
443+
udcollfitbits::Thr1W2, /// 1 MIP thresholds for FT0C ch 32 - ch 96
444+
udcollfitbits::Thr1W3, /// 1 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
445+
udcollfitbits::Thr2W0, /// 2 MIP thresholds for FT0A ch 0 - ch 63
446+
udcollfitbits::Thr2W1, /// 2 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
447+
udcollfitbits::Thr2W2, /// 2 MIP thresholds for FT0C ch 32 - ch 96
448+
udcollfitbits::Thr2W3 /// 2 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
449449
);
450450

451451
using UDCollisionFITBits = UDCollisionFITBits_001;

‎PWGUD/TableProducer/Converters/UDFITbitConverter.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
///
2424
/// \author Sandor Lokos <sandor.lokos@cern.ch>
2525

26-
#include <PWGUD/DataModel/UDTables.h>
26+
#include "PWGUD/DataModel/UDTables.h"
27+
2728
#include <Framework/AnalysisDataModel.h>
2829
#include <Framework/AnalysisHelpers.h>
2930
#include <Framework/AnalysisTask.h>
@@ -59,4 +60,4 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
5960
return WorkflowSpec{
6061
adaptAnalysisTask<UDCollisionFITBitsConverter>(cfgc),
6162
};
62-
}
63+
}

‎PWGUD/Tasks/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ o2physics_add_dpl_workflow(upc-test-fit-bit-mapping
298298
SOURCES upcTestFitBitMapping.cxx
299299
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
300300
COMPONENT_NAME Analysis)
301-
301+
302302
o2physics_add_dpl_workflow(fit-multiplicity
303303
SOURCES upcFITMultiplicity.cxx
304304
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
@@ -307,4 +307,4 @@ o2physics_add_dpl_workflow(fit-multiplicity
307307
o2physics_add_dpl_workflow(pt-spectra-inclusive-upc
308308
SOURCES ptSpectraInclusiveUpc.cxx
309309
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
310-
COMPONENT_NAME Analysis)
310+
COMPONENT_NAME Analysis)

‎PWGUD/Tasks/upcFITMultiplicity.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
#include "PWGUD/Core/UDHelpers.h"
1818
#include "PWGUD/DataModel/UDTables.h"
1919

20-
#include "FT0Base/Geometry.h"
21-
#include "Framework/AnalysisTask.h"
22-
#include "Framework/HistogramRegistry.h"
23-
#include "Framework/Logger.h"
24-
#include "Framework/runDataProcessing.h"
20+
#include <FT0Base/Geometry.h>
21+
#include <Framework/AnalysisTask.h>
22+
#include <Framework/HistogramRegistry.h>
23+
#include <Framework/Logger.h>
24+
#include <Framework/runDataProcessing.h>
2525

2626
#include <array>
2727
#include <cmath>
@@ -99,7 +99,7 @@ struct UpcTestFITBitMapping {
9999
{"map/hEtaC_ntracks", "FT0C #eta with >2 tracks;#eta;counts", {HistType::kTH1F, {{5, -3.1, -2.1}}}},
100100
{"map/hEtaPhiC_ntracks", "FT0C #eta vs #varphi with >2 tracks;#eta;#varphi", {HistType::kTH2F, {{5, -3.1, -2.1}, {9, 0, 2 * M_PI}}}},
101101

102-
{"mult/hPnFT0A_raw", "P(n): FT0A fired-channel multiplicity;N_{fired}^{FT0A};events", {HistType::kTH1F, {{97, -0.5, 96.5}}}},
102+
{"mult/hPnFT0A_raw", "P(n): FT0A fired-channel multiplicity;N_{fired}^{FT0A};events", {HistType::kTH1F, {{97, -0.5, 96.5}}}},
103103
{"mult/hPnFT0C_raw", "P(n): FT0C fired-channel multiplicity;N_{fired}^{FT0C};events", {HistType::kTH1F, {{50, -0.5, 49.5}}}},
104104
{"mult/hPnFV0A_raw", "P(n): FV0A fired-channel multiplicity;N_{fired}^{FV0A};events", {HistType::kTH1F, {{49, -0.5, 48.5}}}},
105105
{"mult/hPnFT0A", "P(n): FT0A fired-channel multiplicity;N_{fired}^{FT0A};events", {HistType::kTH1F, {{97, -0.5, 96.5}}}},
@@ -343,7 +343,7 @@ struct UpcTestFITBitMapping {
343343
const float ft0AmpC = collision.totalFT0AmplitudeC();
344344
const float fv0AmpA = collision.totalFV0AmplitudeA();
345345

346-
registry.fill(HIST("mult/hPnFT0A_raw"), ft0AmpA);
346+
registry.fill(HIST("mult/hPnFT0A_raw"), ft0AmpA);
347347
registry.fill(HIST("mult/hPnFT0C_raw"), ft0AmpC);
348348
registry.fill(HIST("mult/hPnFV0A_raw"), fv0AmpA);
349349

‎PWGUD/Tasks/upcTestFitBitMapping.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
#include "PWGUD/Core/UDHelpers.h"
1818
#include "PWGUD/DataModel/UDTables.h"
1919

20-
#include "FT0Base/Geometry.h"
21-
#include "Framework/AnalysisTask.h"
22-
#include "Framework/HistogramRegistry.h"
23-
#include "Framework/Logger.h"
24-
#include "Framework/runDataProcessing.h"
20+
#include <FT0Base/Geometry.h>
21+
#include <Framework/AnalysisTask.h>
22+
#include <Framework/HistogramRegistry.h>
23+
#include <ramework/Logger.h>
24+
#include <Framework/runDataProcessing.h>
2525

2626
#include <array>
2727
#include <cmath>

0 commit comments

Comments
 (0)