modified: reference_detector.xml

	modified:   src/cb_Solenoid.cpp

reference_detector.xml

@@ -27,12 +27,12 @@
     <constant name="tracker_region_zmax" value="6 * m"/>
     <constant name="tracker_region_rmax" value="6 * m"/>
 
-    <constant name="TestDetector_ID"           value="999"/>
-    <constant name="TestDetector_inner_radius" value="10.0 * cm"/>
-    <constant name="TestDetector_rmin"         value="10.0 * cm"/>
-    <constant name="TestDetector_thickness"    value="100.0 * cm"/>
-    <constant name="TestDetector_inner_z"      value="40.0 * cm"/>
-    <constant name="TestDetector_angle"        value="0.0 * rad"/>
+    <constant name="Solenoid_ID"           value="1"/>
+    <constant name="Solenoid_rmin"         value="1500 * mm"/><comment>FIXME</comment>
+    <constant name="Solenoid_thickness"    value="300.0 * mm"/><comment>FIXME</comment>
+    <constant name="Solenoid_rmax"         value="Solenoid_rmin + Solenoid_thickness"/><comment>FIXME</comment>
+    <constant name="Solenoid_length"       value="3000.0 * mm"/><comment>FIXME</comment>
+    <constant name="Solenoid_angle"        value="0.0 * rad"/>
   </define>
 
   <limits>
@@ -41,23 +41,22 @@
   <regions>
   </regions>
 
-  <!-- Common Generic visualization attributes -->
   <comment>Common Generic visualization attributes</comment>
   <display>
-    <vis name="TestDetectorVis" alpha="0.4"  r= "0.1"  g="0.0"  b="0.1"  showDaughters="true" visible="true"/>
+    <vis name="SolenoidVis" alpha="1.0"  r= "0.0"  g="0.0"  b="1.0"  showDaughters="true" visible="true"/>
   </display>
 
-  <!-- Define detector -->
+
   <detectors>
     <comment>
       Central Barrel Solenoid Magnet
     </comment>
-    <detector id="TestDetector_ID" name="TestDetector" type="TestDetector" vis="TestDetectorVis">
-      <dimensions inner_radius="TestDetector_inner_radius" 
-	          rmin="TestDetector_rmin" 
-	          thickness="TestDetector_thickness" 
-	          inner_z="TestDetector_inner_z" 
-	          angle="TestDetector_angle"/>
+    <detector id="Solenoid_ID" name="Solenoid" type="cb_Solenoid" vis="SolenoidVis">
+      <dimensions inner_radius="TestDetector_inner_radius"
+	          rmin="Solenoid_rmin"
+	          rmin="Solenoid_rmax"
+                  length="Solenoid_length/2.0"
+	          />
       <material name="Steel235"/>
     </detector>
   </detectors>

src/cb_Solenoid.cpp

@@ -12,10 +12,10 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
   int             detID   = detElem.id();
 
   xml::Component dims = detElem.dimensions();
-  double SizeZ  = dims.z();     // Size in Z direction
+  double SizeZ  = dims.length();     // Size in Z direction
   double ROut   = dims.rmax();  // Outer diameter
   double RIn    = dims.rmin();  // Inner diameter
-  double ShiftZ = dims.delta();
+  //double ShiftZ = dims.delta();
   Material mat = desc.material(detElem.materialStr());
 
   Tube   cb_Solenoid_GVol_Solid(RIn, ROut, SizeZ / 2., 0., 360 * deg);
@@ -25,7 +25,7 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
 
   DetElement   det(detName, detID);
   Volume       motherVol = desc.pickMotherVolume(det);
-  Transform3D  tr(RotationZYX(0., 0., 0.), Position(0., 0., ShiftZ));
+  Transform3D  tr(RotationZYX(0., 0., 0.), Position(0., 0., 0));
   PlacedVolume detPV = motherVol.placeVolume(detVol, tr);
   det.setPlacement(detPV);
   return det;