diff --git a/FCCee/IDEA/compact/IDEA_o1_v02/DectDimensions_IDEA_o1_v01.xml b/FCCee/IDEA/compact/IDEA_o1_v02/DectDimensions_IDEA_o1_v01.xml
index c47d6231a..89c7402aa 100644
--- a/FCCee/IDEA/compact/IDEA_o1_v02/DectDimensions_IDEA_o1_v01.xml
+++ b/FCCee/IDEA/compact/IDEA_o1_v02/DectDimensions_IDEA_o1_v01.xml
@@ -19,7 +19,7 @@
-
+
@@ -239,35 +239,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FCCee/IDEA/compact/IDEA_o1_v02/SiliconWrapper_o1_v01.xml b/FCCee/IDEA/compact/IDEA_o1_v02/SiliconWrapper_o1_v01.xml
index 026ebb71c..ea992c6db 100644
--- a/FCCee/IDEA/compact/IDEA_o1_v02/SiliconWrapper_o1_v01.xml
+++ b/FCCee/IDEA/compact/IDEA_o1_v02/SiliconWrapper_o1_v01.xml
@@ -29,13 +29,6 @@
-
-
-
-
-
-
-
@@ -88,7 +81,7 @@
-
+
@@ -129,10 +122,12 @@
- ${GlobalTrackerReadoutID}
+
+ ${GlobalTrackerReadoutID},y:32:-16,z:-16
- ${GlobalTrackerReadoutID}
+
+ ${GlobalTrackerReadoutID},x:32:-16,y:-16
@@ -162,11 +157,11 @@
-
-
+
+
-
-
+
+
@@ -237,11 +232,11 @@
-
-
+
+
-
-
+
+
diff --git a/FCCee/IDEA/compact/IDEA_o1_v02/Vertex_IDEA_o1_v01.xml b/FCCee/IDEA/compact/IDEA_o1_v02/Vertex_IDEA_o1_v01.xml
index 084218a80..b8a36a689 100644
--- a/FCCee/IDEA/compact/IDEA_o1_v02/Vertex_IDEA_o1_v01.xml
+++ b/FCCee/IDEA/compact/IDEA_o1_v02/Vertex_IDEA_o1_v01.xml
@@ -26,15 +26,13 @@
Vertex Assembly
+
-
-
-
@@ -48,7 +46,7 @@
-
+
@@ -320,18 +318,22 @@
- ${GlobalTrackerReadoutID}
+
+ ${GlobalTrackerReadoutID},y:32:-16,z:-16
- ${GlobalTrackerReadoutID}
+
+ ${GlobalTrackerReadoutID},y:32:-16,z:-16
- ${GlobalTrackerReadoutID}
+
+ ${GlobalTrackerReadoutID},x:32:-16,y:-16
+
+
-
@@ -342,8 +344,8 @@
-
-
+
+
@@ -383,8 +385,8 @@
-
-
+
+
@@ -424,8 +426,8 @@
-
-
+
+
@@ -466,8 +468,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -484,21 +499,21 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -555,21 +570,21 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -614,21 +629,21 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -774,18 +789,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/FCCee/IDEA/compact/IDEA_o1_v02/materials_o1_v01.xml b/FCCee/IDEA/compact/IDEA_o1_v02/materials_o1_v01.xml
index f68afa8b4..f03e2edde 100644
--- a/FCCee/IDEA/compact/IDEA_o1_v02/materials_o1_v01.xml
+++ b/FCCee/IDEA/compact/IDEA_o1_v02/materials_o1_v01.xml
@@ -143,6 +143,11 @@
+
+
+
+
+
diff --git a/detector/tracker/VertexBarrel_detailed_o1_v01_geo.cpp b/detector/tracker/VertexBarrel_detailed_o1_v01_geo.cpp
index 9c4923be2..f5cc86d96 100644
--- a/detector/tracker/VertexBarrel_detailed_o1_v01_geo.cpp
+++ b/detector/tracker/VertexBarrel_detailed_o1_v01_geo.cpp
@@ -125,8 +125,8 @@ static Ref_t create_element(Detector& theDetector, xml_h e, SensitiveDetector se
components.rs.push_back(component.r());
Box ele_box = Box(component.thickness()/2., component.width()/2., components.length);
- Volume ele_vol = Volume(components.name + _toString(iComponent, "_%d"), ele_box, theDetector.material(component.materialStr()));
- ele_vol.setVisAttributes(theDetector.visAttributes(component.visStr()));
+ Volume ele_vol = Volume(components.name + _toString(iComponent, "_%d"), ele_box, theDetector.material(component.materialStr()));
+ ele_vol.setAttributes(theDetector, x_det.regionStr(), x_det.limitsStr(), component.visStr());
components.volumes.push_back(ele_vol);
}
@@ -152,8 +152,8 @@ static Ref_t create_element(Detector& theDetector, xml_h e, SensitiveDetector se
endOfStave.rs.push_back(component.r());
Box ele_box = Box(component.thickness()/2., component.width()/2., component.length()/2.);
- Volume ele_vol = Volume(endOfStave.name + _toString(iEndOfStave, "_%d"), ele_box, theDetector.material(component.materialStr()));
- ele_vol.setVisAttributes(component.visStr());
+ Volume ele_vol = Volume(endOfStave.name + _toString(iEndOfStave, "_%d"), ele_box, theDetector.material(component.materialStr()));
+ ele_vol.setAttributes(theDetector, x_det.regionStr(), x_det.limitsStr(), component.visStr());
endOfStave.volumes.push_back(ele_vol);
iEndOfStave++;
@@ -181,7 +181,7 @@ static Ref_t create_element(Detector& theDetector, xml_h e, SensitiveDetector se
// Already create volumes for all sensor components as this is independent of number of sensors per layer
Box ele_box = Box(m.sensor_thickness/2., abs(component.xmax()-component.xmin())/2., abs(component.ymax()-component.ymin())/2.);
Volume ele_vol = Volume("sensor" + _toString(iSensor, "_%d"), ele_box, m.sensor_material);
- ele_vol.setVisAttributes(theDetector.visAttributes(component.visStr()));
+ ele_vol.setAttributes(theDetector, x_det.regionStr(), x_det.limitsStr(), component.visStr());
if(m.sensor_sensitives.back())
ele_vol.setSensitiveDetector(sens);
@@ -196,6 +196,7 @@ static Ref_t create_element(Detector& theDetector, xml_h e, SensitiveDetector se
cout << "Read stave information of stave " << m.name << endl;
}
+ int iModule_tot = 0;
//========= loop over layer elements in xml ======================================
@@ -242,8 +243,6 @@ static Ref_t create_element(Detector& theDetector, xml_h e, SensitiveDetector se
Assembly quadrant_assembly3(layer_name + "_quadrant3");
pv = layer_assembly.placeVolume(quadrant_assembly3);
- int iModule_tot = 0;
-
//--------- loop over ladders ---------------------------
for(int iStave=0; iStave