diff --git a/Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/GeometryTGeo.h b/Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/GeometryTGeo.h index 97056de2361e6..f4a28f233ae9c 100644 --- a/Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/GeometryTGeo.h +++ b/Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/GeometryTGeo.h @@ -90,7 +90,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache int getNumberOfHalfStaves(int lay) const { return mNumberOfHalfStaves[lay]; } int getNumberOfDisksMLOT() const { return mNumberOfDisksMLOT; } - int getNumberOfStavesInDisk(int lay) const { return mFirstStaveIndexDisc[lay+1] - mFirstStaveIndexDisc[lay]; } + int getNumberOfStavesInDisk(int lay) const { return mFirstStaveIndexDisc[lay + 1] - mFirstStaveIndexDisc[lay]; } bool isOwner() const { return mOwner; } void setOwner(bool v) { mOwner = v; } @@ -257,12 +257,12 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache // std::vector mNumberOfChipsPerStave; ///< number of chips per stave in ML/OT // std::vector mNumberOfChipsPerHalfStave; ///< number of chips per half stave in ML/OT // std::vector mNumberOfChipsPerModule; ///< number of chips per module in ML/OT - std::vector mLastChipIndex; ///< max ID of the detector in the petal(VD) or layer(MLOT) - std::vector mLastChipIndexVD; ///< max ID of the detector in the layer for the VD + std::vector mLastChipIndex; ///< max ID of the detector in the petal(VD) or layer(MLOT) + std::vector mLastChipIndexVD; ///< max ID of the detector in the layer for the VD // std::vector mLastChipIndexMLOT; ///< max ID of the detector in the layer for the MLOT std::vector mFirstChipIndexMLOTDisc; ///< ID of the first sensor chip in the layer for the MLOT; array size is one larger than the number of disks; last element equals nChips+1 - std::vector mFirstStaveIndexDisc; ///< Index of first stave (abs ID) in each MLOT Disc - std::vector mFirstChipIndexStave; ///< Index of first chip on stave (Discs) + std::vector mFirstStaveIndexDisc; ///< Index of first stave (abs ID) in each MLOT Disc + std::vector mFirstChipIndexStave; ///< Index of first chip on stave (Discs) std::array mLayerToWrapper; ///< Layer to wrapper correspondence, not implemented yet bool mOwner = true; //! is it owned by the singleton? diff --git a/Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/Specs.h b/Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/Specs.h index 7a478db50b93c..be6d5c8808275 100644 --- a/Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/Specs.h +++ b/Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/Specs.h @@ -145,7 +145,7 @@ constexpr double thickness{20 * mu}; namespace MLOTDisks { -constexpr int nLayers{12}; // number of disks in the ML and OT +constexpr int nLayers{12}; // number of disks in the ML and OT } } // namespace o2::trk::constants diff --git a/Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx b/Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx index e056b08c63312..1ad0552aa768c 100644 --- a/Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx +++ b/Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx @@ -303,15 +303,14 @@ int GeometryTGeo::getLayerTRK(int index) const } int subDetID = getSubDetID(index); int firstDetLayer = 0; - - // NOTE: taking these from o2::trk::constants, instead + + // NOTE: taking these from o2::trk::constants, instead // of the geometry that is constructed in the 'Build' function // risks inconsistencies... if (subDetID == 1) { firstDetLayer = o2::trk::constants::VD::petal::nLayers; - } - else if (subDetID == 2) { + } else if (subDetID == 2) { firstDetLayer = o2::trk::constants::VD::petal::nLayers + o2::trk::constants::ML::nLayers + o2::trk::constants::OT::nLayers; } return firstDetLayer + getLayer(index); @@ -437,8 +436,7 @@ int GeometryTGeo::getChip(int index) const int chipsPerModule = Nchip; return index % chipsPerModule; } - } - else if (subDetID == 2) { // Forward disks (FT3) + } else if (subDetID == 2) { // Forward disks (FT3) int lay = getLayer(index); int stave = getStave(index); return index - mFirstChipIndexStave[mFirstStaveIndexDisc[lay] + stave]; @@ -564,12 +562,11 @@ TString GeometryTGeo::getMatrixPath(int index) const path += Form("%s%d_%d/", getTRKChipPattern(), layer, chip); // TRKChipx_y path += Form("%s%d_1/", getTRKSensorPattern(), layer); // TRKSensorx_1 } - } - else if (subDetID == 2) { + } else if (subDetID == 2) { int direction = 0; - if (layer >= mNumberOfDisksMLOT/2) { + if (layer >= mNumberOfDisksMLOT / 2) { direction = 1; - layer -= mNumberOfDisksMLOT/2; + layer -= mNumberOfDisksMLOT / 2; } path += Form("%s%d_%d_1/", getFT3LayerPattern(), direction, layer); path += Form("FT3Sensor_Active_%d_%d_%d_%d_%d", direction, layer, stave, chip, chip); @@ -755,7 +752,7 @@ int GeometryTGeo::extractNumberOfDisksMLOT(int dir) const int numDiscs = 0; while (gGeoManager->GetVolume(composeSymNameLayerFT3(dir, numDiscs))) { numDiscs++; - } // Check maybe subvolume? + } // Check maybe subvolume? return numDiscs; // Assume same # layers on both sides } diff --git a/Detectors/Upgrades/ALICE3/TRK/simulation/include/TRKSimulation/Digitizer.h b/Detectors/Upgrades/ALICE3/TRK/simulation/include/TRKSimulation/Digitizer.h index de7778a5af661..69a73d3ab8319 100644 --- a/Detectors/Upgrades/ALICE3/TRK/simulation/include/TRKSimulation/Digitizer.h +++ b/Detectors/Upgrades/ALICE3/TRK/simulation/include/TRKSimulation/Digitizer.h @@ -127,7 +127,7 @@ class Digitizer { if (subDetID == 0) { // VD return constants::VD::petal::layer::nRows[layer]; - } else if (subDetID == 1 || subDetID == 2) { // ML/OT + } else if (subDetID == 1 || subDetID == 2) { // ML/OT return constants::moduleMLOT::chip::nRows; } return 0; diff --git a/Detectors/Upgrades/ALICE3/TRK/simulation/src/Digitizer.cxx b/Detectors/Upgrades/ALICE3/TRK/simulation/src/Digitizer.cxx index 4b04a7752213d..17b269e950df3 100644 --- a/Detectors/Upgrades/ALICE3/TRK/simulation/src/Digitizer.cxx +++ b/Detectors/Upgrades/ALICE3/TRK/simulation/src/Digitizer.cxx @@ -123,8 +123,8 @@ void Digitizer::process(const std::vector* hits, int evID, int srcID, int l << " at time " << mEventTime.getTimeNS() << " ROFrame = " << mNewROFrame << " Min/Max ROFrames " << mROFrameMin << "/" << mROFrameMax << " layer " << layer; - //std::cout << "Printing segmentation info: " << std::endl; - //SegmentationChip::Print(); + // std::cout << "Printing segmentation info: " << std::endl; + // SegmentationChip::Print(); // is there something to flush ? if (mNewROFrame > mROFrameMin) { @@ -310,7 +310,7 @@ void Digitizer::processHit(const o2::trk::Hit& hit, uint32_t& maxFr, int evID, i const auto& matrix = mGeometry->getMatrixL2G(hit.GetDetectorID()); // matrix.print(); - + /// transorm from the global detector coordinates to the local detector coordinates math_utils::Vector3D xyzLocS(matrix ^ (hit.GetPosStart())); // start position in sensor frame math_utils::Vector3D xyzLocE(matrix ^ (hit.GetPos())); // end position in sensor frame @@ -403,8 +403,8 @@ void Digitizer::processHit(const o2::trk::Hit& hit, uint32_t& maxFr, int evID, i float cRowPix = 0.f, cColPix = 0.f; // local coordinate of the current pixel center const o2::trk::ChipSimResponse* resp = getChipResponse(chipID); - //std::cout << "Printing chip response:" << std::endl; - //resp->print(); + // std::cout << "Printing chip response:" << std::endl; + // resp->print(); // take into account that the ChipSimResponse depth defintion has different min/max boundaries // although the max should coincide with the surface of the epitaxial layer, which in the chip