Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
1481922
basic geometry and data format for new detector
pkurash Sep 2, 2024
07dc65a
Merge branch 'AliceO2Group:dev' into new-detector3
pkurash Sep 2, 2024
c417fcb
fixed geometry and json
pkurash Sep 3, 2024
58436cd
Merge branch 'new-detector3' of github.com:pkurash/AliceO2 into new-d…
pkurash Sep 3, 2024
44bef8c
fixed hits
pkurash Sep 3, 2024
deadde8
updated geometry and detector source code
pkurash Sep 3, 2024
e77714d
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 4, 2024
dd8656e
updated geometry and detector source code
pkurash Sep 3, 2024
ad83fef
Merge branch 'new-detector4' of github.com:pkurash/AliceO2 into new-d…
pkurash Sep 4, 2024
73d3a4a
minor fixes
pkurash Sep 6, 2024
9c4883c
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 7, 2024
605bf80
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 9, 2024
f500ae8
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 11, 2024
863ff24
sensitive volumes
pkurash Sep 7, 2024
69019f6
geometry update
pkurash Sep 12, 2024
84943c2
geometry update
pkurash Sep 12, 2024
d04a89c
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 14, 2024
7c92e44
enable hits
pkurash Sep 16, 2024
2b00551
enable hits
pkurash Sep 16, 2024
c070c3f
enable hits
pkurash Sep 16, 2024
1ea137b
fix channel ids
pkurash Sep 18, 2024
340cf47
More flexible confgurable parameters
pkurash Sep 18, 2024
f77b1c2
More flexible confgurable parameters
pkurash Sep 18, 2024
cddc156
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 18, 2024
63bff65
update parameters and geometry
pkurash Sep 23, 2024
9750bf6
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 28, 2024
7c9bb95
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 1, 2024
266c9a4
fixed ring sizes
pkurash Oct 6, 2024
5d36321
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 6, 2024
752d06a
Merge branch 'new-detector4' of github.com:pkurash/AliceO2 into new-d…
pkurash Oct 6, 2024
358535a
merge conflict
pkurash Oct 10, 2024
70ab460
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 10, 2024
f3c1995
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 10, 2024
4042468
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 11, 2024
0e41796
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 14, 2024
64aacfc
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 15, 2024
a4b7469
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 22, 2024
d0a2026
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 29, 2024
5f54923
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Nov 6, 2024
87ed532
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Nov 18, 2024
55e7b74
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Nov 27, 2024
17cab7b
GPU
pkurash Nov 6, 2024
6cbbc4c
fix conflicts
pkurash Nov 6, 2024
ca61de3
resolve conflicts
pkurash Nov 6, 2024
2955b51
head
pkurash Nov 27, 2024
39e68ad
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Dec 3, 2024
ddb07fe
GPU
pkurash Oct 15, 2024
74d9138
added Constants.h to store constants
pkurash Dec 3, 2024
8f06eeb
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Dec 13, 2024
2ead4be
Adding Constants.h and correcting formatting issues
pkurash Dec 13, 2024
0b61e19
Adding Constants.h and correcting formatting issues
pkurash Dec 13, 2024
0ab8a28
Adding Constants.h and correcting formatting issues
pkurash Dec 13, 2024
6920911
Adding Constants.h and correcting formatting issues
pkurash Dec 13, 2024
df6da1c
Adding Constants.h and correcting formatting issues
pkurash Dec 13, 2024
76eaa66
Adding Constants.h and correcting formatting issues
pkurash Dec 13, 2024
49b8490
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Dec 16, 2024
643e50a
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Dec 21, 2024
327a095
created new namespace
pkurash Dec 21, 2024
be15827
created new namespace
pkurash Dec 21, 2024
2b8a26e
created new namespace
pkurash Dec 21, 2024
d79cf33
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Dec 24, 2024
fe0e9e3
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Jan 22, 2025
a38641e
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Jan 27, 2025
fbf4595
change name of the detector
pkurash Jan 27, 2025
c7bf68d
change name of the detector
pkurash Jan 27, 2025
e4cee5d
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Jan 29, 2025
e02c8b4
check errors
pkurash Jan 29, 2025
a37a782
check errors
pkurash Jan 29, 2025
75e5611
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Jan 31, 2025
96ad811
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Feb 2, 2025
dcef291
Flexible ring radii, a new Boolean switch for module A, module covera…
pkurash Feb 2, 2025
f27e878
correct default number of ring of A side
pkurash Feb 3, 2025
c19814f
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Feb 4, 2025
afc6b39
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Feb 8, 2025
f52a170
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Feb 10, 2025
78555d8
Modified default parameters
pkurash Feb 10, 2025
ca2c0fb
Hits from charged tracks only
pkurash Feb 10, 2025
bf7b954
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Feb 11, 2025
e2b6b28
Fixed hit merging
pkurash Feb 11, 2025
8911e66
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Feb 14, 2025
a12df3e
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Feb 19, 2025
96c6826
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Feb 27, 2025
d80e3e7
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Mar 5, 2025
f2b04d4
return to the previous choice
pkurash Mar 6, 2025
0912aa3
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Mar 7, 2025
35eb86e
updated eta min/max definitions
pkurash Mar 9, 2025
83f19a6
Merge branch 'new-detector4' of github.com:pkurash/AliceO2 into new-d…
pkurash Mar 9, 2025
4ead620
updated eta definitions
pkurash Mar 10, 2025
a8e4a0d
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Mar 13, 2025
aeebdb8
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Mar 18, 2025
f264f9a
remove spurious files
pkurash Mar 19, 2025
e0fa607
Update CMake
pkurash Mar 20, 2025
3976bb1
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Mar 25, 2025
e451741
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Mar 26, 2025
6321735
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Mar 27, 2025
acd685b
removed GPU file
pkurash Mar 30, 2025
f674c9b
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Mar 30, 2025
7eeb149
Add FD detector
pkurash Mar 30, 2025
dca0079
Merge branch 'new-detector4' of github.com:pkurash/AliceO2 into new-d…
pkurash Mar 30, 2025
52d750a
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Apr 3, 2025
67a233c
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Apr 15, 2025
b148f09
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Apr 23, 2025
9158354
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Apr 30, 2025
b4a13e0
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash May 20, 2025
65af1c8
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash May 21, 2025
9662815
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash May 24, 2025
730ed68
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Jun 24, 2025
95b58db
including aluminium containers
pkurash Jun 24, 2025
3d995f4
including aluminium containers
pkurash Jun 24, 2025
7ed8c70
including aluminium containers
pkurash Jun 24, 2025
81b173b
including aluminium containers
pkurash Jun 24, 2025
33f113c
including aluminium containers
pkurash Jun 26, 2025
779051b
Please consider the following formatting changes
alibuild Jun 26, 2025
f03d62c
Merge pull request #6 from alibuild/alibot-cleanup-13476
pkurash Jun 26, 2025
ba1a865
Updated Readme
pkurash Jul 3, 2025
648bb6a
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Jul 3, 2025
180fecc
Merge branch 'new-detector4' of github.com:pkurash/AliceO2 into new-d…
pkurash Jul 3, 2025
914e929
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Jul 10, 2025
0b61e9a
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Jul 12, 2025
2d1bd3b
introduced FD hit data format
pkurash Jul 19, 2025
a8598f2
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Jul 19, 2025
e1b320e
introduced FD hit data format
pkurash Jul 19, 2025
af5699b
corrected copyright notice
pkurash Jul 19, 2025
691b39f
corrected copyright notice
pkurash Jul 19, 2025
0638cac
corrected copyright notice
pkurash Jul 19, 2025
a22c25a
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Jul 26, 2025
fae2d5f
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Aug 2, 2025
4d834d7
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Aug 6, 2025
c130e76
Finding detId from fMC
pkurash Aug 11, 2025
27410da
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Aug 11, 2025
847793b
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Aug 23, 2025
b1ca536
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Aug 28, 2025
b84fdbd
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 7, 2025
21545f8
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 12, 2025
dc31a81
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 21, 2025
1d17389
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 22, 2025
5162f29
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Sep 26, 2025
e300281
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 3, 2025
303c84f
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 7, 2025
c3553cb
colors
pkurash Oct 3, 2025
ee96e8d
change detector name
pkurash Oct 9, 2025
5959ee9
change detector name
pkurash Oct 9, 2025
c942507
change detector name
pkurash Oct 9, 2025
9fe5eff
change detector name
pkurash Oct 9, 2025
a2c79e7
Merge branch 'AliceO2Group:dev' into new-detector4
pkurash Oct 16, 2025
d893b69
Fix formatting in CMakeLists.txt for FD3Simulation
pkurash Oct 16, 2025
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
sensitive volumes
  • Loading branch information
pkurash committed Sep 11, 2024
commit 863ff24b1cd13521fee20d8b9e77750520696a72
20 changes: 17 additions & 3 deletions Detectors/Upgrades/ALICE3/FVD/simulation/src/Detector.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ TGeoVolumeAssembly* Detector::buildModuleA()
const float dphiDeg = 45.;

for (int ir = 0; ir < FVDBaseParam::nRingsA; ir++) {
std::string rName = "fvd_ring" + std::to_string(ir+1);
TGeoVolumeAssembly *ring = new TGeoVolumeAssembly(rName.c_str());
for (int ic = 0; ic < 8; ic ++) {
int cellId = ic + 8*ir;
std::string tbsName = "tbs" + std::to_string(cellId);
Expand All @@ -248,8 +250,9 @@ TGeoVolumeAssembly* Detector::buildModuleA()
float dz = FVDBaseParam::dzScint;
auto tbs = new TGeoTubeSeg(tbsName.c_str(), rmin, rmax, dz, phimin, phimax);
auto nod = new TGeoVolume(nodeName.c_str(), tbs, medium);
mod->AddNode(nod, cellId);
ring->AddNode(nod, cellId);
}
mod->AddNode(ring, ir);
}

return mod;
Expand All @@ -264,6 +267,8 @@ TGeoVolumeAssembly* Detector::buildModuleC()
const float dphiDeg = 45.;

for (int ir = 0; ir < FVDBaseParam::nRingsC; ir++) {
std::string rName = "fvd_ring" + std::to_string(ir+1+FVDBaseParam::nRingsA);
TGeoVolumeAssembly *ring = new TGeoVolumeAssembly(rName.c_str());
for (int ic = 0; ic < 8; ic ++) {
int cellId = ic + 8*ir + FVDBaseParam::nCellA;
std::string tbsName = "tbs" + std::to_string(cellId);
Expand All @@ -275,8 +280,9 @@ TGeoVolumeAssembly* Detector::buildModuleC()
float dz = FVDBaseParam::dzScint;
auto tbs = new TGeoTubeSeg(tbsName.c_str(), rmin, rmax, dz, phimin, phimax);
auto nod = new TGeoVolume(nodeName.c_str(), tbs, medium);
mod->AddNode(nod, cellId);
ring->AddNode(nod, cellId);
}
mod->AddNode(ring, ir);
}

return mod;
Expand All @@ -285,5 +291,13 @@ TGeoVolumeAssembly* Detector::buildModuleC()
void Detector::defineSensitiveVolumes()
{
LOG(info) << "Adding FVD Sentitive Volumes";

TGeoVolume *v;
TString volumeName;

for (int iv = 0; iv < FVDBaseParam::nCellA + FVDBaseParam::nCellC; iv ++) {
volumeName = "fvd_node" + std::to_string(iv);
v = gGeoManager->GetVolume(volumeName);
LOG(info) << "Adding FVD Sensitive Volume => " << v->GetName();
AddSensitiveVolume(v);
}
}