Fixed material and more commented

cb_Solenoid.xml

@@ -28,9 +28,9 @@
     <constant name="tracker_region_rmax" value="6 * m"/>
 
     <constant name="cb_Solenoid_ID"    value="1"/>
-    <constant name="cb_Solenoid_rmin"  value="0.0 * cm"/>
-    <constant name="cb_Solenoid_rmax"  value="137.0 * cm"/>
-    <constant name="cb_Solenoid_z"     value="400.0 * cm"/>
+    <constant name="cb_Solenoid_rmin"  value="0.0 * cm"/>   <!-- Central Barrel Solenoid Inner diameter -->
+    <constant name="cb_Solenoid_rmax"  value="137.0 * cm"/> <!-- Central Barrel Solenoid Outer diameter -->
+    <constant name="cb_Solenoid_z"     value="400.0 * cm"/> <!-- Central Barrel Solenoid Size in Z direction -->
     <constant name="cb_Solenoid_shift" value="0.0 * cm"/>
   </define>
 
@@ -51,9 +51,8 @@
     <comment>
       Central Barrel Solenoid Magnet
     </comment>
-    <!-- TODO: Add material -->
     <detector id="cb_Solenoid_ID" name="cb_Solenoid" type="cb_Solenoid" insideTrackingVolume="false" vis="cb_SolenoidVis">
-      <material name="Steel235"/>	    
+	    <material name="Vacuum"/>  <!-- G4_Galactic -->	    
       <dimensions rmin="cb_Solenoid_rmin" rmax="cb_Solenoid_rmax" z="cb_Solenoid_z" delta="cb_Solenoid_shift"/>
     </detector>
   </detectors>
@@ -61,7 +60,7 @@
   <plugins>
   </plugins>
 
-  <!-- TODO: Define field -->
+  <!-- TODO: Define field using field map-->
   <fields>
     <field type="solenoid" name="GlobalSolenoid" inner_field="1.5 * tesla" outer_field="0.5*tesla" 
            zmin="100.0 * cm" zmax="100.0 * cm" inner_radius="100.0 * cm" outer_radius="100.0 * cm"/>

materials.xml

@@ -12,7 +12,7 @@
   </material>
   <!-- We model vakuum just as very thin air -->
   <material name="Vacuum">
-    <D type="density" unit="g/cm3" value="0.0000000001"/>
+    <D type="density" unit="g/cm3" value="1.e-25"/>
     <fraction n="0.754" ref="N"/>
     <fraction n="0.234" ref="O"/>
     <fraction n="0.012" ref="Ar"/>

src/cb_Solenoid.cpp

@@ -12,12 +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 ROut   = dims.rmax(); // Outer diameter
-  double RIn    = dims.rmin(); // Inner diameter
+  double SizeZ  = dims.z();     // Size in Z direction
+  double ROut   = dims.rmax();  // Outer diameter
+  double RIn    = dims.rmin();  // Inner diameter
   double ShiftZ = dims.delta();
-  // TODO: Material
-  //Material mat  = desc.material("Steel235");
   Material mat = desc.material(detElem.materialStr());
 
   Tube   cb_Solenoid_GVol_Solid(RIn, ROut, SizeZ / 2., 0., 360 * deg);