Skip to content

A3: Add geometries for IOTOF #15073

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
njacazio wants to merge 1 commit into
base: dev
Choose a base branch
from
+56 −20
Open

A3: Add geometries for IOTOF #15073

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
1 change: 1 addition & 0 deletions Detectors/Upgrades/ALICE3/IOTOF/base/include/IOTOFBase/IOTOFBaseParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ struct IOTOFBaseParam : public o2::conf::ConfigurableParamHelper<IOTOFBaseParam>
bool enableOuterTOF = true;
bool enableForwardTOF = true;
bool enableBackwardTOF = true;
std::string detectorPattern = "";

O2ParamDef(IOTOFBaseParam, "IOTOFBase");
};
Expand Down
2 changes: 1 addition & 1 deletion Detectors/Upgrades/ALICE3/IOTOF/simulation/include/IOTOFSimulation/Detector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class Detector : public o2::base::DetImpl<Detector>
return nullptr;
}

void configLayers(bool itof = true, bool otof = true, bool ftof = true, bool btof = true);
void configLayers(bool itof = true, bool otof = true, bool ftof = true, bool btof = true, std::string pattern = "");

void configServices();
void createMaterials();
Expand Down
73 changes: 54 additions & 19 deletions Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
#include "IOTOFSimulation/Detector.h"
#include "IOTOFBase/IOTOFBaseParam.h"

using o2::itsmft::Hit;

namespace o2
{
namespace iotof
Expand All @@ -40,7 +38,9 @@ Detector::Detector(bool active)
mHits(o2::utils::createSimVector<o2::itsmft::Hit>())
{
auto& iotofPars = IOTOFBaseParam::Instance();
configLayers(iotofPars.enableInnerTOF, iotofPars.enableOuterTOF, iotofPars.enableForwardTOF);
configLayers(iotofPars.enableInnerTOF, iotofPars.enableOuterTOF,
iotofPars.enableForwardTOF, iotofPars.enableBackwardTOF,
iotofPars.detectorPattern);
}

Detector::~Detector()
Expand All @@ -56,19 +56,54 @@ void Detector::ConstructGeometry()
createGeometry();
}

void Detector::configLayers(bool itof, bool otof, bool ftof, bool btof)
void Detector::configLayers(bool itof, bool otof, bool ftof, bool btof, std::string pattern)
{

float radiusInnerTof = 19.f;
float radiusOuterTof = 85.f;
float lengthInnerTof = 124.f;
float lengthOuterTof = 680.f;
std::pair<float, float> radiusRangeDiskTof = {15.f, 100.f};
float zForwardTof = 370.f;
if (pattern == "") {
} else if (pattern == "v3b") {
LOG(info) << "Configuring IOTOF layers with v3b pattern";
ftof = false;
btof = false;
} else if (pattern == "v3b1a") {
lengthOuterTof = 500.f;
zForwardTof = 270.f;
radiusRangeDiskTof = {30.f, 100.f};
} else if (pattern == "v3b1b") {
lengthOuterTof = 500.f;
zForwardTof = 200.f;
radiusRangeDiskTof = {20.f, 68.f};
} else if (pattern == "v3b2a") {
lengthOuterTof = 440.f;
zForwardTof = 270.f;
radiusRangeDiskTof = {30.f, 120.f};
} else if (pattern == "v3b2b") {
lengthOuterTof = 440.f;
zForwardTof = 200.f;
radiusRangeDiskTof = {20.f, 68.f};
} else if (pattern == "v3b3") {
lengthOuterTof = 580.f;
zForwardTof = 200.f;
radiusRangeDiskTof = {20.f, 68.f};
} else {
LOG(fatal) << "IOTOF layer pattern " << pattern << " not recognized, exiting";
}
if (itof) {
mITOFLayer = ITOFLayer(std::string{GeometryTGeo::getITOFLayerPattern()}, 19.f, 0.f, 124.f, 0.f, 0.02f, true); // iTOF
mITOFLayer = ITOFLayer(std::string{GeometryTGeo::getITOFLayerPattern()}, radiusInnerTof, 0.f, lengthInnerTof, 0.f, 0.02f, true); // iTOF
}
if (otof) {
mOTOFLayer = OTOFLayer(std::string{GeometryTGeo::getOTOFLayerPattern()}, 85.f, 0.f, 680.f, 0.f, 0.02f, true); // oTOF
mOTOFLayer = OTOFLayer(std::string{GeometryTGeo::getOTOFLayerPattern()}, radiusOuterTof, 0.f, lengthOuterTof, 0.f, 0.02f, true); // oTOF
}
if (ftof) {
mFTOFLayer = FTOFLayer(std::string{GeometryTGeo::getFTOFLayerPattern()}, 15.f, 100.f, 0.f, 370.f, 0.02f, false); // fTOF
mFTOFLayer = FTOFLayer(std::string{GeometryTGeo::getFTOFLayerPattern()}, radiusRangeDiskTof.first, radiusRangeDiskTof.second, 0.f, zForwardTof, 0.02f, false); // fTOF
}
if (btof) {
mBTOFLayer = BTOFLayer(std::string{GeometryTGeo::getBTOFLayerPattern()}, 15.f, 100.f, 0.f, -370.f, 0.02f, false); // bTOF
mBTOFLayer = BTOFLayer(std::string{GeometryTGeo::getBTOFLayerPattern()}, radiusRangeDiskTof.first, radiusRangeDiskTof.second, 0.f, -zForwardTof, 0.02f, false); // bTOF
}
}

Expand Down Expand Up @@ -214,28 +249,28 @@ bool Detector::ProcessHits(FairVolume* vol)
bool startHit = false, stopHit = false;
unsigned char status = 0;
if (fMC->IsTrackEntering()) {
status |= Hit::kTrackEntering;
status |= o2::itsmft::Hit::kTrackEntering;
}
if (fMC->IsTrackInside()) {
status |= Hit::kTrackInside;
status |= o2::itsmft::Hit::kTrackInside;
}
if (fMC->IsTrackExiting()) {
status |= Hit::kTrackExiting;
status |= o2::itsmft::Hit::kTrackExiting;
}
if (fMC->IsTrackOut()) {
status |= Hit::kTrackOut;
status |= o2::itsmft::Hit::kTrackOut;
}
if (fMC->IsTrackStop()) {
status |= Hit::kTrackStopped;
status |= o2::itsmft::Hit::kTrackStopped;
}
if (fMC->IsTrackAlive()) {
status |= Hit::kTrackAlive;
status |= o2::itsmft::Hit::kTrackAlive;
}

// track is entering or created in the volume
if ((status & Hit::kTrackEntering) || (status & Hit::kTrackInside && !mTrackData.mHitStarted)) {
if ((status & o2::itsmft::Hit::kTrackEntering) || (status & o2::itsmft::Hit::kTrackInside && !mTrackData.mHitStarted)) {
startHit = true;
} else if ((status & (Hit::kTrackExiting | Hit::kTrackOut | Hit::kTrackStopped))) {
} else if ((status & (o2::itsmft::Hit::kTrackExiting | o2::itsmft::Hit::kTrackOut | o2::itsmft::Hit::kTrackStopped))) {
stopHit = true;
}

Expand Down Expand Up @@ -264,9 +299,9 @@ bool Detector::ProcessHits(FairVolume* vol)
fMC->CurrentVolOffID(3, halfstave);
fMC->CurrentVolOffID(4, stave);

Hit* p = addHit(stack->GetCurrentTrackNumber(), lay, mTrackData.mPositionStart.Vect(), positionStop.Vect(),
mTrackData.mMomentumStart.Vect(), mTrackData.mMomentumStart.E(), positionStop.T(),
mTrackData.mEnergyLoss, mTrackData.mTrkStatusStart, status);
o2::itsmft::Hit* p = addHit(stack->GetCurrentTrackNumber(), lay, mTrackData.mPositionStart.Vect(), positionStop.Vect(),
mTrackData.mMomentumStart.Vect(), mTrackData.mMomentumStart.E(), positionStop.T(),
mTrackData.mEnergyLoss, mTrackData.mTrkStatusStart, status);

// RS: not sure this is needed
// Increment number of Detector det points in TParticle
Expand Down