Skip to content

ALICE3: prepare IOTOF geometry for including TOF in tracking #15521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mpuccio wants to merge 1 commit into
base: dev
Choose a base branch
from
+39 −10
Open

ALICE3: prepare IOTOF geometry for including TOF in tracking #15521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions Detectors/Upgrades/ALICE3/IOTOF/base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
o2_add_library(IOTOFBase
SOURCES src/GeometryTGeo.cxx
src/IOTOFBaseParam.cxx
PUBLIC_LINK_LIBRARIES O2::DetectorsBase)
PUBLIC_LINK_LIBRARIES O2::DetectorsBase
O2::MathUtils)

o2_target_root_dictionary(IOTOFBase
HEADERS include/IOTOFBase/GeometryTGeo.h
include/IOTOFBase/IOTOFBaseParam.h)
include/IOTOFBase/IOTOFBaseParam.h)
23 changes: 15 additions & 8 deletions Detectors/Upgrades/ALICE3/IOTOF/base/include/IOTOFBase/GeometryTGeo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
#define ALICEO2_IOTOF_GEOMETRYTGEO_H

#include <memory>
#include <string>
#include <vector>
#include <DetectorsCommonDataFormats/DetMatrixCache.h>
#include <IOTOFBase/IOTOFBaseParam.h>
#include <MathUtils/Cartesian.h>

namespace o2
{
Expand Down Expand Up @@ -88,8 +92,11 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache

int getIOTOFFirstChipIndex(int lay) const;
int getIOTOFLayer(int index) const;
bool isValidIOTOFChipIndex(int index) const { return index >= 0 && index <= mLastChipIndex[1]; }
int getIOTOFChipIndex(int lay, int sta, int mod, int chip) const;
bool getIOTOFChipId(int index, int& lay, int& sta, int& mod, int& chip) const;
o2::math_utils::Point3D<float> detectorToLocal(int row, int col, int chipId) const;
static const ChipSpecifics& getChipSpecifics(int iotofLayer);

/// Get the transformation matrix of the SENSOR (not necessary the same as the chip)
/// for a given chip 'index' by querying the TGeoManager
Expand Down Expand Up @@ -156,18 +163,18 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
static std::string sBTOFSensorName;

// Inner/outer TOF
int mNumberOfStavesIOTOF[2];
int mNumberOfModulesIOTOF[2];
int mNumberOfChipsPerModuleIOTOF[2];
int mNumberOfChipsPerStaveIOTOF[2];
int mNumberOfChipsIOTOF[2];
int mLastChipIndex[2];
int mNumberOfStavesIOTOF[2]{};
int mNumberOfModulesIOTOF[2]{};
int mNumberOfChipsPerModuleIOTOF[2]{};
int mNumberOfChipsPerStaveIOTOF[2]{};
int mNumberOfChipsIOTOF[2]{};
int mLastChipIndex[2]{-1, -1};

// Forward TOF
int mNumberOfChipsFTOF;
int mNumberOfChipsFTOF = 0;

// Backward TOF
int mNumberOfChipsBTOF;
int mNumberOfChipsBTOF = 0;

std::vector<int> sensors;
std::vector<float> mCacheRefX; /// cache for X of IOTOF
Expand Down
21 changes: 21 additions & 0 deletions Detectors/Upgrades/ALICE3/IOTOF/base/src/GeometryTGeo.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <IOTOFBase/GeometryTGeo.h>
#include <IOTOFBase/IOTOFBaseParam.h>
#include <MathUtils/Utils.h>
#include <TGeoManager.h>
#include <TMath.h>

Expand Down Expand Up @@ -166,6 +167,24 @@ bool GeometryTGeo::getIOTOFChipId(int index, int& lay, int& sta, int& mod, int&
return true;
}

const ChipSpecifics& GeometryTGeo::getChipSpecifics(int iotofLayer)
{
if (iotofLayer == 0) {
return ITOFChipSpecificParam::Instance();
}
return OTOFChipSpecificParam::Instance();
}

o2::math_utils::Point3D<float> GeometryTGeo::detectorToLocal(int row, int col, int chipId) const
{
const auto& specs = getChipSpecifics(getIOTOFLayer(chipId));
o2::math_utils::Point3D<float> loc;
loc.SetCoordinates(0.5f * ((specs.ActiveMatrixSizeRows() - specs.PassiveEdgeTop + specs.PassiveEdgeReadOut) - specs.PitchRow) - row * specs.PitchRow,
0.f,
col * specs.PitchCol + 0.5f * (specs.PitchCol - specs.ActiveMatrixSizeCols()));
return loc;
}

TString GeometryTGeo::getMatrixPath(int index) const
{
int lay, sta, mod, chip;
Expand Down Expand Up @@ -276,6 +295,8 @@ void GeometryTGeo::Build(int loadTrans)

void GeometryTGeo::defineSensors()
{
sensors.clear();
sensors.reserve(mSize);
for (int i = 0; i < mSize; i++) {
sensors.push_back(i);
}
Expand Down