Skip to content

[ITS, ITS3] Add first version of ITS3 descriptor in ITS geometry #10289

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

Merged
shahor02 merged 11 commits into from
Nov 21, 2022
Merged

[ITS, ITS3] Add first version of ITS3 descriptor in ITS geometry #10289

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
32dc40e
Apply naming conventions
fgrosa Nov 8, 2022
de0609e
Add first version of DTS3 descriptr in ITS geometry
fgrosa Nov 16, 2022
38e3943
Remove leftover comment
fgrosa Nov 16, 2022
99d7048
Fix format
fgrosa Nov 16, 2022
f762d99
Fix whitespace
fgrosa Nov 16, 2022
71d60cc
Attempt to fix circular dependencies
fgrosa Nov 16, 2022
5bd9e50
Fix whitespaces
fgrosa Nov 16, 2022
355f0cf
Fix CI
fgrosa Nov 17, 2022
efbbc4e
Fix format
fgrosa Nov 17, 2022
e2c9e27
Fix CI
fgrosa Nov 17, 2022
8ef37b4
Implement Matteo's comment
fgrosa Nov 18, 2022
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
Prev Previous commit
Next Next commit
Fix CI
  • Loading branch information
@fgrosa
fgrosa committed Nov 17, 2022
commit 355f0cff33b6caa451ab37d1dcf520c091fd04d0
3 changes: 1 addition & 2 deletions Detectors/ITSMFT/ITS/base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ o2_add_library(ITSBase
SOURCES src/GeometryTGeo.cxx src/ContainerFactory.cxx
src/MisalignmentParameter.cxx
src/DescriptorInnerBarrel.cxx
PUBLIC_LINK_LIBRARIES O2::DetectorsBase O2::ITSMFTBase O2::ITS3Base)

PUBLIC_LINK_LIBRARIES O2::DetectorsBase O2::ITSMFTBase $<$<BOOL:${ENABLE_UPGRADES}>:O2::ITS3Base>)
o2_target_root_dictionary(ITSBase
HEADERS include/ITSBase/GeometryTGeo.h
include/ITSBase/ContainerFactory.h
Expand Down
14 changes: 11 additions & 3 deletions Detectors/ITSMFT/ITS/base/src/GeometryTGeo.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@

// ATTENTION: In opposite to old AliITSgeomTGeo, all indices start from 0, not from 1!!!

#include <fairlogger/Logger.h> // for LOG
#include "ITSBase/GeometryTGeo.h"
#include "DetectorsBase/GeometryManager.h"
#include "ITSMFTBase/SegmentationAlpide.h"
#include "ITS3Base/SegmentationSuperAlpide.h"
#include "MathUtils/Cartesian.h"

#include <fairlogger/Logger.h> // for LOG
#ifdef ENABLE_UPGRADES
#include "ITS3Base/SegmentationSuperAlpide.h"
#endif

#include <TGeoBBox.h> // for TGeoBBox
#include <TGeoManager.h> // for gGeoManager, TGeoManager
Expand All @@ -47,7 +49,10 @@ using namespace o2::its;
using namespace o2::detectors;

using Segmentation = o2::itsmft::SegmentationAlpide;

#ifdef ENABLE_UPGRADES
using SegmentationITS3 = o2::its3::SegmentationSuperAlpide;
#endif

ClassImp(o2::its::GeometryTGeo);

Expand Down Expand Up @@ -285,8 +290,9 @@ bool GeometryTGeo::getChipId(int index, int& lay, int& hba, int& sta, int& hsta,
//__________________________________________________________________________
const char* GeometryTGeo::composeSymNameITS(bool isITS3)
{
if (isITS3)
if (isITS3) {
return o2::detectors::DetID(o2::detectors::DetID::IT3).getName();
}

return o2::detectors::DetID(o2::detectors::DetID::ITS).getName();
}
Expand Down Expand Up @@ -388,7 +394,9 @@ TGeoHMatrix* GeometryTGeo::extractMatrixSensor(int index) const
// account for the difference between physical sensitive layer (where charge collection is simulated) and effective sensor ticknesses
double delta = 0.;
if (mIsLayerITS3[lay]) {
#ifdef ENABLE_UPGRADES
delta = SegmentationITS3::SensorLayerThickness - SegmentationITS3::SensorLayerThicknessEff;
#endif
} else {
delta = Segmentation::SensorLayerThickness - Segmentation::SensorLayerThicknessEff;
}
Expand Down
4 changes: 2 additions & 2 deletions Detectors/ITSMFT/ITS/simulation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ o2_add_library(ITSSimulation
SOURCES src/V11Geometry.cxx src/V1Layer.cxx src/V3Layer.cxx
src/Detector.cxx src/V3Services.cxx src/V3Cage.cxx
src/DescriptorInnerBarrelITS2.cxx
PUBLIC_LINK_LIBRARIES O2::ITSBase O2::ITS3Base O2::ITSMFTSimulation O2::ITS3Simulation
ROOT::Physics)
PUBLIC_LINK_LIBRARIES O2::ITSBase O2::ITSMFTSimulation ROOT::Physics
$<$<BOOL:${ENABLE_UPGRADES}>:O2::ITS3Base> $<$<BOOL:${ENABLE_UPGRADES}>:O2::ITS3Simulation>)

o2_target_root_dictionary(ITSSimulation
HEADERS include/ITSSimulation/Detector.h
Expand Down
5 changes: 4 additions & 1 deletion Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Detector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@
#include "DetectorsCommonDataFormats/DetID.h" // for Detector
#include "ITSMFTSimulation/Hit.h" // for Hit
#include "ITSSimulation/DescriptorInnerBarrelITS2.h" // for Description of Inner Barrel (ITS2)
#include "ITS3Simulation/DescriptorInnerBarrelITS3.h" // for Description of Inner Barrel (ITS3)
#include "Rtypes.h" // for Int_t, Double_t, Float_t, Bool_t, etc
#include "TArrayD.h" // for TArrayD
#include "TGeoManager.h" // for gGeoManager, TGeoManager (ptr only)
#include "TLorentzVector.h" // for TLorentzVector
#include "TVector3.h" // for TVector3

#ifdef ENABLE_UPGRADES
#include "ITS3Simulation/DescriptorInnerBarrelITS3.h" // for Description of Inner Barrel (ITS3)
#endif

class FairVolume;
class TGeoVolume;

Expand Down
9 changes: 9 additions & 0 deletions Detectors/ITSMFT/ITS/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ using std::endl;
using o2::itsmft::Hit;
using Segmentation = o2::itsmft::SegmentationAlpide;
using namespace o2::its;

#ifdef ENABLE_UPGRADES
using namespace o2::its3;
#endif

Detector::Detector()
: o2::base::DetImpl<Detector>("ITS", kTRUE),
Expand Down Expand Up @@ -141,7 +144,9 @@ Detector::Detector(Bool_t active, TString name)
if (name == "ITS") {
mDescriptorIB.reset(new DescriptorInnerBarrelITS2(3));
} else if (name == "IT3") {
#ifdef ENABLE_UPGRADES
mDescriptorIB.reset(new DescriptorInnerBarrelITS3(DescriptorInnerBarrelITS3::ThreeLayersNoDeadZones));
#endif
} else {
LOG(fatal) << "Detector name not supported (options ITS and ITS3)";
}
Expand Down Expand Up @@ -197,7 +202,9 @@ Detector::Detector(Bool_t active, TString name)
if (detName == "ITS") {
dynamic_cast<DescriptorInnerBarrelITS2*>(mDescriptorIB.get())->configure();
} else if (detName == "IT3") {
#ifdef ENABLE_UPGRADES
dynamic_cast<DescriptorInnerBarrelITS3*>(mDescriptorIB.get())->configure();
#endif
}
configOuterBarrelITS(mNumberInnerLayers);
}
Expand Down Expand Up @@ -858,7 +865,9 @@ void Detector::constructDetectorGeometry()
if (detName == "ITS") {
mGeometry[j] = dynamic_cast<DescriptorInnerBarrelITS2*>(mDescriptorIB.get())->createLayer(j, wrapVols[0]); // define IB layers on first wrapper volume always
} else if (detName == "IT3") {
#ifdef ENABLE_UPGRADES
dynamic_cast<DescriptorInnerBarrelITS3*>(mDescriptorIB.get())->createLayer(j, wrapVols[0]); // define IB layers on first wrapper volume always
#endif
}
mWrapperLayerId[j] = 0;
} else {
Expand Down