Skip to content
Closed
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ struct AlmiraParam : public o2::conf::ConfigurableParamHelper<AlmiraParam> {
int roFrameLengthInBCPerLayer[kNLayers] = {0}; ///< ROF length in BC per layer
float strobeDelayPerLayer[kNLayers] = {0}; ///< strobe delay in ns per layer
float strobeLengthContPerLayer[kNLayers] = {0}; ///< strobe length in ns per layer
int roFrameBiasInBCPerLayer[kNLayers] = {0}; ///< ROF start bias in BC per layer
int roFrameDelayInBCPerLayer[kNLayers] = {0}; ///< extra ROF delay in BC per layer
int roFrameBiasInBCPerLayer[kNLayers] = {0}; ///< ROF start bias in BC per layer
int roFrameDelayInBCPerLayer[kNLayers] = {0}; ///< extra ROF delay in BC per layer

int getROFLengthInBC(int layer) const {
int getROFLengthInBC(int layer) const
{
if (roFrameLengthInBCPerLayer[layer] > 0) {
return roFrameLengthInBCPerLayer[layer];
} else {
Expand All @@ -46,7 +47,6 @@ struct AlmiraParam : public o2::conf::ConfigurableParamHelper<AlmiraParam> {
int getROFBiasInBC(int layer) const { return roFrameBiasInBCPerLayer[layer]; }
int getROFDelayInBC(int layer) const { return roFrameDelayInBCPerLayer[layer]; }


O2ParamDef(AlmiraParam, "TRKAlmiraParam");
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
int getSubDetID(int index) const;
int getPetalCase(int index) const;
int getDisk(int index) const;
int getLayer(int index) const; ///< local layer index within the sub-detector (0-based per VD/MLOT)
int getLayerTRK(int index) const; ///< global layer index across the full TRK (VD layers 0..nVD-1, MLOT layers nVD..nTotal-1)
int getLayer(int index) const; ///< local layer index within the sub-detector (0-based per VD/MLOT)
int getLayerTRK(int index) const; ///< global layer index across the full TRK (VD layers 0..nVD-1, MLOT layers nVD..nTotal-1)
int getStave(int index) const;
int getHalfStave(int index) const;
int getModule(int index) const;
Expand Down
4 changes: 2 additions & 2 deletions Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/Specs.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ constexpr int nCols{static_cast<int>(length / chip::pitchZ)};

namespace ML
{
constexpr int nLayers{3}; // number of layers in the ML
constexpr int nLayers{3}; // number of layers in the ML
constexpr double width{constants::moduleMLOT::width * 1}; // width of the stave
// constexpr double length{constants::moduleMLOT::length * 10}; // length of the stave
constexpr double length{124 * cm}; // length of the stave, hardcoded to fit the implemented geometry
Expand All @@ -118,7 +118,7 @@ constexpr double length{258 * cm}; // len
constexpr int nRows{static_cast<int>(width / moduleMLOT::chip::pitchX)}; // number of rows in the halfstave
constexpr int nCols{static_cast<int>(length / moduleMLOT::chip::pitchZ)}; // number of columns in the halfstave
} // namespace halfstave
constexpr int nLayers{5}; // number of layers in the OT
constexpr int nLayers{5}; // number of layers in the OT
constexpr double width{halfstave::width * 2}; // width of the stave
constexpr double length{halfstave::length}; // length of the stave
constexpr int nRows{static_cast<int>(width / moduleMLOT::chip::pitchX)}; // number of rows in the stave
Expand Down
2 changes: 0 additions & 2 deletions Detectors/Upgrades/ALICE3/TRK/macros/test/CheckBandwidth.C
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ void CheckBandwidth(std::string digifile = "trkdigits.root", std::string inputGe
rofLengthBC[iLayer] = (*rofRecords[iLayer])[1].getBCData().bc - (*rofRecords[iLayer])[0].getBCData().bc;
}


// --- Collision context ---

TFile* ccFile = TFile::Open(collContextFile.data());
Expand Down Expand Up @@ -229,7 +228,6 @@ void CheckBandwidth(std::string digifile = "trkdigits.root", std::string inputGe

// --- Accumulate per-chip digit counts across all ROFs ---


std::vector<unsigned long long> digitsPerChip(nChips, 0ull);
std::vector<unsigned int> maxDigitsPerROFPerChip(nChips, 0u);
std::vector<unsigned int> digitsInCurrentROFPerChip(nChips, 0u);
Expand Down
380 changes: 196 additions & 184 deletions Detectors/Upgrades/ALICE3/TRK/macros/test/CheckClusters.C

Large diffs are not rendered by default.

Loading
Loading