Skip to content
Snippets Groups Projects

Tweaked solid geometry to make it match what Jay says.

Merged Whitney Armstrong requested to merge whit/NPDet:solid_geo_update into master
1 file
+ 9
4
Compare changes
  • Side-by-side
  • Inline
@@ -142,8 +142,11 @@ static Ref_t create_detector(Detector& lcdd, xml_h e, SensitiveDetector sens)
@@ -142,8 +142,11 @@ static Ref_t create_detector(Detector& lcdd, xml_h e, SensitiveDetector sens)
rOuter = {
rOuter = {
285.00*cm,285.00*cm
285.00*cm,285.00*cm
};
};
 
 
// From Jay: 10ft from magnet to back of EC
 
double z_endcap_donut0 = 209.01*cm + 10*12*2.54*cm;
zPlane = {
zPlane = {
209.01*cm,485.00*cm
209.01*cm, z_endcap_donut0 // 485.00*cm
};
};
Polycone endcap_donut( 0, ///< Initial Phi starting angle
Polycone endcap_donut( 0, ///< Initial Phi starting angle
360*deg, ///< Total Phi angle
360*deg, ///< Total Phi angle
@@ -165,7 +168,7 @@ static Ref_t create_detector(Detector& lcdd, xml_h e, SensitiveDetector sens)
@@ -165,7 +168,7 @@ static Ref_t create_detector(Detector& lcdd, xml_h e, SensitiveDetector sens)
285.00*cm,285.00*cm
285.00*cm,285.00*cm
};
};
zPlane = {
zPlane = {
485.01*cm,500.00*cm
z_endcap_donut0,z_endcap_donut0 + 15.0*cm
};
};
Polycone endcap_bottom_inner( 0, ///< Initial Phi starting angle
Polycone endcap_bottom_inner( 0, ///< Initial Phi starting angle
360*deg, ///< Total Phi angle
360*deg, ///< Total Phi angle
@@ -187,7 +190,9 @@ static Ref_t create_detector(Detector& lcdd, xml_h e, SensitiveDetector sens)
@@ -187,7 +190,9 @@ static Ref_t create_detector(Detector& lcdd, xml_h e, SensitiveDetector sens)
185.00*cm,170.00*cm
185.00*cm,170.00*cm
};
};
zPlane = {
zPlane = {
500.01*cm,515.00*cm
z_endcap_donut0 + 15.01*cm ,
 
z_endcap_donut0 + 30.0*cm
 
//500.01*cm,515.00*cm
};
};
Polycone endcap_bottom_outer( 0, ///< Initial Phi starting angle
Polycone endcap_bottom_outer( 0, ///< Initial Phi starting angle
360*deg, ///< Total Phi angle
360*deg, ///< Total Phi angle
@@ -209,7 +214,7 @@ static Ref_t create_detector(Detector& lcdd, xml_h e, SensitiveDetector sens)
@@ -209,7 +214,7 @@ static Ref_t create_detector(Detector& lcdd, xml_h e, SensitiveDetector sens)
60.00*cm,90.00*cm,90.00*cm
60.00*cm,90.00*cm,90.00*cm
};
};
zPlane = {
zPlane = {
189.00*cm,405.00*cm,485.00*cm
z_endcap_donut0 - 296.0*cm,z_endcap_donut0 - 80.0*cm ,z_endcap_donut0
};
};
Polycone endcap_nose( 0, ///< Initial Phi starting angle
Polycone endcap_nose( 0, ///< Initial Phi starting angle
360*deg, ///< Total Phi angle
360*deg, ///< Total Phi angle
Loading