Author: [log in to unmask]
Date: Fri Feb 12 19:04:57 2016
New Revision: 4220
Log:
adjust PS field value
Modified:
java/trunk/detector-data/detectors/HPS-PhysicsRun2016-1_5mm-v4-4/HPS-PhysicsRun2016-1_5mm-v4-4.lcdd
java/trunk/detector-data/detectors/HPS-PhysicsRun2016-1_5mm-v4-4/compact.xml
java/trunk/detector-data/detectors/HPS-PhysicsRun2016-2mm-v4-4/HPS-PhysicsRun2016-2mm-v4-4.lcdd
java/trunk/detector-data/detectors/HPS-PhysicsRun2016-2mm-v4-4/compact.xml
java/trunk/detector-data/detectors/HPS-PhysicsRun2016-3mm-v4-4/HPS-PhysicsRun2016-3mm-v4-4.lcdd
java/trunk/detector-data/detectors/HPS-PhysicsRun2016-3mm-v4-4/compact.xml
java/trunk/detector-data/detectors/HPS-PhysicsRun2016-4mm-v4-4/HPS-PhysicsRun2016-4mm-v4-4.lcdd
java/trunk/detector-data/detectors/HPS-PhysicsRun2016-4mm-v4-4/compact.xml
java/trunk/detector-data/detectors/HPS-PhysicsRun2016-Nominal-v4-4/HPS-PhysicsRun2016-Nominal-v4-4.lcdd
java/trunk/detector-data/detectors/HPS-PhysicsRun2016-Nominal-v4-4/compact.xml
Modified: java/trunk/detector-data/detectors/HPS-PhysicsRun2016-1_5mm-v4-4/HPS-PhysicsRun2016-1_5mm-v4-4.lcdd
=============================================================================
--- java/trunk/detector-data/detectors/HPS-PhysicsRun2016-1_5mm-v4-4/HPS-PhysicsRun2016-1_5mm-v4-4.lcdd (original)
+++ java/trunk/detector-data/detectors/HPS-PhysicsRun2016-1_5mm-v4-4/HPS-PhysicsRun2016-1_5mm-v4-4.lcdd Fri Feb 12 19:04:57 2016
@@ -8335,7 +8335,7 @@
</setup>
</gdml>
<fields>
- <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="21.17" y="0.0" z="457.2" dx="500.0" dy="500.0" dz="540.0" bx="0.0" by="-0.5" bz="0.0" />
+ <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="21.17" y="0.0" z="457.2" dx="500.0" dy="500.0" dz="540.0" bx="0.0" by="-0.524" bz="0.0" />
</fields>
</lcdd>
Modified: java/trunk/detector-data/detectors/HPS-PhysicsRun2016-1_5mm-v4-4/compact.xml
=============================================================================
--- java/trunk/detector-data/detectors/HPS-PhysicsRun2016-1_5mm-v4-4/compact.xml (original)
+++ java/trunk/detector-data/detectors/HPS-PhysicsRun2016-1_5mm-v4-4/compact.xml Fri Feb 12 19:04:57 2016
@@ -33,7 +33,7 @@
<constant name="dipoleMagnetHeight" value="100*cm" />
<constant name="dipoleMagnetWidth" value="100*cm" />
<constant name="dipoleMagnetLength" value="108*cm" />
- <constant name="constBFieldY" value="-0.5" />
+ <constant name="constBFieldY" value="-0.524" />
<!-- ECAL crystal dimensions -->
@@ -91,17 +91,17 @@
<constant name="z02b" value="0+157.5+3.685" />
<!-- Global Millepede tweak parameters (survey constraints)-->
- <!--
- <constant name="dOmega_top" value="1.56e-5" />
- <constant name="dLambda_top" value="0.16e-3" />
- <constant name="dPhi_top" value="6.87e-3" />
- <constant name="dD0_top" value="-0.72" />
- <constant name="dZ0_top" value="-0.13" />
- <constant name="dOmega_bot" value="2.32e-5" />
- <constant name="dLambda_bot" value="-0.06e-3" />
- <constant name="dPhi_bot" value="17.92e-3" />
- <constant name="dD0_bot" value="-6.71" />
- <constant name="dZ0_bot" value="0.04" />
+ <!--
+ <constant name="dOmega_top" value="1.56e-5" />
+ <constant name="dLambda_top" value="0.16e-3" />
+ <constant name="dPhi_top" value="6.87e-3" />
+ <constant name="dD0_top" value="-0.72" />
+ <constant name="dZ0_top" value="-0.13" />
+ <constant name="dOmega_bot" value="2.32e-5" />
+ <constant name="dLambda_bot" value="-0.06e-3" />
+ <constant name="dPhi_bot" value="17.92e-3" />
+ <constant name="dD0_bot" value="-6.71" />
+ <constant name="dZ0_bot" value="0.04" />
-->
<!-- Global Millepede tweak parameters (mixed constraints: FEE momentum set at 1.05 GeV, top and bottom must agree on d0 and z0)-->
@@ -117,17 +117,17 @@
<constant name="dZ0_bot" value="0.116788238356" />
<!-- Global Millepede tweak parameters (external constraints)-->
- <!--
- <constant name="dOmega_top" value="0.1e-5" />
- <constant name="dLambda_top" value="0.5e-3" />
- <constant name="dPhi_top" value="1.5e-3" />
- <constant name="dD0_top" value="0.8" />
- <constant name="dZ0_top" value="-0.15" />
- <constant name="dOmega_bot" value="2.4e-5" />
- <constant name="dLambda_bot" value="1.5e-3" />
- <constant name="dPhi_bot" value="17e-3" />
- <constant name="dD0_bot" value="-5.6" />
- <constant name="dZ0_bot" value="0.2" />
+ <!--
+ <constant name="dOmega_top" value="0.1e-5" />
+ <constant name="dLambda_top" value="0.5e-3" />
+ <constant name="dPhi_top" value="1.5e-3" />
+ <constant name="dD0_top" value="0.8" />
+ <constant name="dZ0_top" value="-0.15" />
+ <constant name="dOmega_bot" value="2.4e-5" />
+ <constant name="dLambda_bot" value="1.5e-3" />
+ <constant name="dPhi_bot" value="17e-3" />
+ <constant name="dD0_bot" value="-5.6" />
+ <constant name="dZ0_bot" value="0.2" />
-->
</define>
@@ -781,24 +781,24 @@
</millepede_constants>
</detector>
-<!--
- <detector id="30" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsFieldDef" >
- <comment>Boundary planes for magnetic field, also used as scoring planes</comment>
- <module name="TestRunModuleFieldDef">
- <box x="416.052" y="177.8" />
- <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
- </module>
- <module name="TestRunModuleFieldDefFlare2">
- <box x="416.052" y="177.8+(327.66-177.8)*(dipoleMagnetPositionZ+dipoleMagnetLength/2-913.378)/385.572" />
- <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
- </module>
- <layer id="1">
- <module_placement name="TestRunModuleFieldDef" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ-dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
- </layer>
- <layer id="2">
- <module_placement name="TestRunModuleFieldDefFlare2" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ+dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
- </layer>
- </detector>
+<!--
+ <detector id="30" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsFieldDef" >
+ <comment>Boundary planes for magnetic field, also used as scoring planes</comment>
+ <module name="TestRunModuleFieldDef">
+ <box x="416.052" y="177.8" />
+ <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+ </module>
+ <module name="TestRunModuleFieldDefFlare2">
+ <box x="416.052" y="177.8+(327.66-177.8)*(dipoleMagnetPositionZ+dipoleMagnetLength/2-913.378)/385.572" />
+ <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+ </module>
+ <layer id="1">
+ <module_placement name="TestRunModuleFieldDef" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ-dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+ </layer>
+ <layer id="2">
+ <module_placement name="TestRunModuleFieldDefFlare2" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ+dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+ </layer>
+ </detector>
-->
<detector id="29" name="ECalScoring" type="HPSTracker2" readout="TrackerHitsECal" insideTrackingVolume="false">
@@ -864,9 +864,9 @@
</fields>
-->
- <fields>
- <field type="BoxDipole" name="AnalyzingDipole" x="dipoleMagnetPositionX" y="0*cm" z="dipoleMagnetPositionZ" dx="dipoleMagnetWidth/2.0" dy="dipoleMagnetHeight/2.0" dz="dipoleMagnetLength/2.0" bx="0.0" by="constBFieldY" bz="0.0" />
- </fields>
+ <fields>
+ <field type="BoxDipole" name="AnalyzingDipole" x="dipoleMagnetPositionX" y="0*cm" z="dipoleMagnetPositionZ" dx="dipoleMagnetWidth/2.0" dy="dipoleMagnetHeight/2.0" dz="dipoleMagnetLength/2.0" bx="0.0" by="constBFieldY" bz="0.0" />
+ </fields>
<includes>
<gdmlFile file="gdml/ecal_vacuum_flange_complete_v1.gdml" />
Modified: java/trunk/detector-data/detectors/HPS-PhysicsRun2016-2mm-v4-4/HPS-PhysicsRun2016-2mm-v4-4.lcdd
=============================================================================
--- java/trunk/detector-data/detectors/HPS-PhysicsRun2016-2mm-v4-4/HPS-PhysicsRun2016-2mm-v4-4.lcdd (original)
+++ java/trunk/detector-data/detectors/HPS-PhysicsRun2016-2mm-v4-4/HPS-PhysicsRun2016-2mm-v4-4.lcdd Fri Feb 12 19:04:57 2016
@@ -8335,7 +8335,7 @@
</setup>
</gdml>
<fields>
- <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="21.17" y="0.0" z="457.2" dx="500.0" dy="500.0" dz="540.0" bx="0.0" by="-0.5" bz="0.0" />
+ <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="21.17" y="0.0" z="457.2" dx="500.0" dy="500.0" dz="540.0" bx="0.0" by="-0.524" bz="0.0" />
</fields>
</lcdd>
Modified: java/trunk/detector-data/detectors/HPS-PhysicsRun2016-2mm-v4-4/compact.xml
=============================================================================
--- java/trunk/detector-data/detectors/HPS-PhysicsRun2016-2mm-v4-4/compact.xml (original)
+++ java/trunk/detector-data/detectors/HPS-PhysicsRun2016-2mm-v4-4/compact.xml Fri Feb 12 19:04:57 2016
@@ -33,7 +33,7 @@
<constant name="dipoleMagnetHeight" value="100*cm" />
<constant name="dipoleMagnetWidth" value="100*cm" />
<constant name="dipoleMagnetLength" value="108*cm" />
- <constant name="constBFieldY" value="-0.5" />
+ <constant name="constBFieldY" value="-0.524" />
<!-- ECAL crystal dimensions -->
@@ -91,17 +91,17 @@
<constant name="z02b" value="0+157.5+3.685" />
<!-- Global Millepede tweak parameters (survey constraints)-->
- <!--
- <constant name="dOmega_top" value="1.56e-5" />
- <constant name="dLambda_top" value="0.16e-3" />
- <constant name="dPhi_top" value="6.87e-3" />
- <constant name="dD0_top" value="-0.72" />
- <constant name="dZ0_top" value="-0.13" />
- <constant name="dOmega_bot" value="2.32e-5" />
- <constant name="dLambda_bot" value="-0.06e-3" />
- <constant name="dPhi_bot" value="17.92e-3" />
- <constant name="dD0_bot" value="-6.71" />
- <constant name="dZ0_bot" value="0.04" />
+ <!--
+ <constant name="dOmega_top" value="1.56e-5" />
+ <constant name="dLambda_top" value="0.16e-3" />
+ <constant name="dPhi_top" value="6.87e-3" />
+ <constant name="dD0_top" value="-0.72" />
+ <constant name="dZ0_top" value="-0.13" />
+ <constant name="dOmega_bot" value="2.32e-5" />
+ <constant name="dLambda_bot" value="-0.06e-3" />
+ <constant name="dPhi_bot" value="17.92e-3" />
+ <constant name="dD0_bot" value="-6.71" />
+ <constant name="dZ0_bot" value="0.04" />
-->
<!-- Global Millepede tweak parameters (mixed constraints: FEE momentum set at 1.05 GeV, top and bottom must agree on d0 and z0)-->
@@ -117,17 +117,17 @@
<constant name="dZ0_bot" value="0.116788238356" />
<!-- Global Millepede tweak parameters (external constraints)-->
- <!--
- <constant name="dOmega_top" value="0.1e-5" />
- <constant name="dLambda_top" value="0.5e-3" />
- <constant name="dPhi_top" value="1.5e-3" />
- <constant name="dD0_top" value="0.8" />
- <constant name="dZ0_top" value="-0.15" />
- <constant name="dOmega_bot" value="2.4e-5" />
- <constant name="dLambda_bot" value="1.5e-3" />
- <constant name="dPhi_bot" value="17e-3" />
- <constant name="dD0_bot" value="-5.6" />
- <constant name="dZ0_bot" value="0.2" />
+ <!--
+ <constant name="dOmega_top" value="0.1e-5" />
+ <constant name="dLambda_top" value="0.5e-3" />
+ <constant name="dPhi_top" value="1.5e-3" />
+ <constant name="dD0_top" value="0.8" />
+ <constant name="dZ0_top" value="-0.15" />
+ <constant name="dOmega_bot" value="2.4e-5" />
+ <constant name="dLambda_bot" value="1.5e-3" />
+ <constant name="dPhi_bot" value="17e-3" />
+ <constant name="dD0_bot" value="-5.6" />
+ <constant name="dZ0_bot" value="0.2" />
-->
</define>
@@ -781,24 +781,24 @@
</millepede_constants>
</detector>
-<!--
- <detector id="30" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsFieldDef" >
- <comment>Boundary planes for magnetic field, also used as scoring planes</comment>
- <module name="TestRunModuleFieldDef">
- <box x="416.052" y="177.8" />
- <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
- </module>
- <module name="TestRunModuleFieldDefFlare2">
- <box x="416.052" y="177.8+(327.66-177.8)*(dipoleMagnetPositionZ+dipoleMagnetLength/2-913.378)/385.572" />
- <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
- </module>
- <layer id="1">
- <module_placement name="TestRunModuleFieldDef" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ-dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
- </layer>
- <layer id="2">
- <module_placement name="TestRunModuleFieldDefFlare2" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ+dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
- </layer>
- </detector>
+<!--
+ <detector id="30" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsFieldDef" >
+ <comment>Boundary planes for magnetic field, also used as scoring planes</comment>
+ <module name="TestRunModuleFieldDef">
+ <box x="416.052" y="177.8" />
+ <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+ </module>
+ <module name="TestRunModuleFieldDefFlare2">
+ <box x="416.052" y="177.8+(327.66-177.8)*(dipoleMagnetPositionZ+dipoleMagnetLength/2-913.378)/385.572" />
+ <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+ </module>
+ <layer id="1">
+ <module_placement name="TestRunModuleFieldDef" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ-dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+ </layer>
+ <layer id="2">
+ <module_placement name="TestRunModuleFieldDefFlare2" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ+dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+ </layer>
+ </detector>
-->
<detector id="29" name="ECalScoring" type="HPSTracker2" readout="TrackerHitsECal" insideTrackingVolume="false">
@@ -864,9 +864,9 @@
</fields>
-->
- <fields>
- <field type="BoxDipole" name="AnalyzingDipole" x="dipoleMagnetPositionX" y="0*cm" z="dipoleMagnetPositionZ" dx="dipoleMagnetWidth/2.0" dy="dipoleMagnetHeight/2.0" dz="dipoleMagnetLength/2.0" bx="0.0" by="constBFieldY" bz="0.0" />
- </fields>
+ <fields>
+ <field type="BoxDipole" name="AnalyzingDipole" x="dipoleMagnetPositionX" y="0*cm" z="dipoleMagnetPositionZ" dx="dipoleMagnetWidth/2.0" dy="dipoleMagnetHeight/2.0" dz="dipoleMagnetLength/2.0" bx="0.0" by="constBFieldY" bz="0.0" />
+ </fields>
<includes>
<gdmlFile file="gdml/ecal_vacuum_flange_complete_v1.gdml" />
Modified: java/trunk/detector-data/detectors/HPS-PhysicsRun2016-3mm-v4-4/HPS-PhysicsRun2016-3mm-v4-4.lcdd
=============================================================================
--- java/trunk/detector-data/detectors/HPS-PhysicsRun2016-3mm-v4-4/HPS-PhysicsRun2016-3mm-v4-4.lcdd (original)
+++ java/trunk/detector-data/detectors/HPS-PhysicsRun2016-3mm-v4-4/HPS-PhysicsRun2016-3mm-v4-4.lcdd Fri Feb 12 19:04:57 2016
@@ -8335,7 +8335,7 @@
</setup>
</gdml>
<fields>
- <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="21.17" y="0.0" z="457.2" dx="500.0" dy="500.0" dz="540.0" bx="0.0" by="-0.5" bz="0.0" />
+ <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="21.17" y="0.0" z="457.2" dx="500.0" dy="500.0" dz="540.0" bx="0.0" by="-0.524" bz="0.0" />
</fields>
</lcdd>
Modified: java/trunk/detector-data/detectors/HPS-PhysicsRun2016-3mm-v4-4/compact.xml
=============================================================================
--- java/trunk/detector-data/detectors/HPS-PhysicsRun2016-3mm-v4-4/compact.xml (original)
+++ java/trunk/detector-data/detectors/HPS-PhysicsRun2016-3mm-v4-4/compact.xml Fri Feb 12 19:04:57 2016
@@ -33,7 +33,7 @@
<constant name="dipoleMagnetHeight" value="100*cm" />
<constant name="dipoleMagnetWidth" value="100*cm" />
<constant name="dipoleMagnetLength" value="108*cm" />
- <constant name="constBFieldY" value="-0.5" />
+ <constant name="constBFieldY" value="-0.524" />
<!-- ECAL crystal dimensions -->
@@ -91,17 +91,17 @@
<constant name="z02b" value="0+157.5+3.685" />
<!-- Global Millepede tweak parameters (survey constraints)-->
- <!--
- <constant name="dOmega_top" value="1.56e-5" />
- <constant name="dLambda_top" value="0.16e-3" />
- <constant name="dPhi_top" value="6.87e-3" />
- <constant name="dD0_top" value="-0.72" />
- <constant name="dZ0_top" value="-0.13" />
- <constant name="dOmega_bot" value="2.32e-5" />
- <constant name="dLambda_bot" value="-0.06e-3" />
- <constant name="dPhi_bot" value="17.92e-3" />
- <constant name="dD0_bot" value="-6.71" />
- <constant name="dZ0_bot" value="0.04" />
+ <!--
+ <constant name="dOmega_top" value="1.56e-5" />
+ <constant name="dLambda_top" value="0.16e-3" />
+ <constant name="dPhi_top" value="6.87e-3" />
+ <constant name="dD0_top" value="-0.72" />
+ <constant name="dZ0_top" value="-0.13" />
+ <constant name="dOmega_bot" value="2.32e-5" />
+ <constant name="dLambda_bot" value="-0.06e-3" />
+ <constant name="dPhi_bot" value="17.92e-3" />
+ <constant name="dD0_bot" value="-6.71" />
+ <constant name="dZ0_bot" value="0.04" />
-->
<!-- Global Millepede tweak parameters (mixed constraints: FEE momentum set at 1.05 GeV, top and bottom must agree on d0 and z0)-->
@@ -117,17 +117,17 @@
<constant name="dZ0_bot" value="0.116788238356" />
<!-- Global Millepede tweak parameters (external constraints)-->
- <!--
- <constant name="dOmega_top" value="0.1e-5" />
- <constant name="dLambda_top" value="0.5e-3" />
- <constant name="dPhi_top" value="1.5e-3" />
- <constant name="dD0_top" value="0.8" />
- <constant name="dZ0_top" value="-0.15" />
- <constant name="dOmega_bot" value="2.4e-5" />
- <constant name="dLambda_bot" value="1.5e-3" />
- <constant name="dPhi_bot" value="17e-3" />
- <constant name="dD0_bot" value="-5.6" />
- <constant name="dZ0_bot" value="0.2" />
+ <!--
+ <constant name="dOmega_top" value="0.1e-5" />
+ <constant name="dLambda_top" value="0.5e-3" />
+ <constant name="dPhi_top" value="1.5e-3" />
+ <constant name="dD0_top" value="0.8" />
+ <constant name="dZ0_top" value="-0.15" />
+ <constant name="dOmega_bot" value="2.4e-5" />
+ <constant name="dLambda_bot" value="1.5e-3" />
+ <constant name="dPhi_bot" value="17e-3" />
+ <constant name="dD0_bot" value="-5.6" />
+ <constant name="dZ0_bot" value="0.2" />
-->
</define>
@@ -781,24 +781,24 @@
</millepede_constants>
</detector>
-<!--
- <detector id="30" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsFieldDef" >
- <comment>Boundary planes for magnetic field, also used as scoring planes</comment>
- <module name="TestRunModuleFieldDef">
- <box x="416.052" y="177.8" />
- <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
- </module>
- <module name="TestRunModuleFieldDefFlare2">
- <box x="416.052" y="177.8+(327.66-177.8)*(dipoleMagnetPositionZ+dipoleMagnetLength/2-913.378)/385.572" />
- <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
- </module>
- <layer id="1">
- <module_placement name="TestRunModuleFieldDef" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ-dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
- </layer>
- <layer id="2">
- <module_placement name="TestRunModuleFieldDefFlare2" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ+dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
- </layer>
- </detector>
+<!--
+ <detector id="30" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsFieldDef" >
+ <comment>Boundary planes for magnetic field, also used as scoring planes</comment>
+ <module name="TestRunModuleFieldDef">
+ <box x="416.052" y="177.8" />
+ <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+ </module>
+ <module name="TestRunModuleFieldDefFlare2">
+ <box x="416.052" y="177.8+(327.66-177.8)*(dipoleMagnetPositionZ+dipoleMagnetLength/2-913.378)/385.572" />
+ <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+ </module>
+ <layer id="1">
+ <module_placement name="TestRunModuleFieldDef" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ-dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+ </layer>
+ <layer id="2">
+ <module_placement name="TestRunModuleFieldDefFlare2" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ+dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+ </layer>
+ </detector>
-->
<detector id="29" name="ECalScoring" type="HPSTracker2" readout="TrackerHitsECal" insideTrackingVolume="false">
@@ -864,9 +864,9 @@
</fields>
-->
- <fields>
- <field type="BoxDipole" name="AnalyzingDipole" x="dipoleMagnetPositionX" y="0*cm" z="dipoleMagnetPositionZ" dx="dipoleMagnetWidth/2.0" dy="dipoleMagnetHeight/2.0" dz="dipoleMagnetLength/2.0" bx="0.0" by="constBFieldY" bz="0.0" />
- </fields>
+ <fields>
+ <field type="BoxDipole" name="AnalyzingDipole" x="dipoleMagnetPositionX" y="0*cm" z="dipoleMagnetPositionZ" dx="dipoleMagnetWidth/2.0" dy="dipoleMagnetHeight/2.0" dz="dipoleMagnetLength/2.0" bx="0.0" by="constBFieldY" bz="0.0" />
+ </fields>
<includes>
<gdmlFile file="gdml/ecal_vacuum_flange_complete_v1.gdml" />
Modified: java/trunk/detector-data/detectors/HPS-PhysicsRun2016-4mm-v4-4/HPS-PhysicsRun2016-4mm-v4-4.lcdd
=============================================================================
--- java/trunk/detector-data/detectors/HPS-PhysicsRun2016-4mm-v4-4/HPS-PhysicsRun2016-4mm-v4-4.lcdd (original)
+++ java/trunk/detector-data/detectors/HPS-PhysicsRun2016-4mm-v4-4/HPS-PhysicsRun2016-4mm-v4-4.lcdd Fri Feb 12 19:04:57 2016
@@ -8335,7 +8335,7 @@
</setup>
</gdml>
<fields>
- <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="21.17" y="0.0" z="457.2" dx="500.0" dy="500.0" dz="540.0" bx="0.0" by="-0.5" bz="0.0" />
+ <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="21.17" y="0.0" z="457.2" dx="500.0" dy="500.0" dz="540.0" bx="0.0" by="-0.524" bz="0.0" />
</fields>
</lcdd>
Modified: java/trunk/detector-data/detectors/HPS-PhysicsRun2016-4mm-v4-4/compact.xml
=============================================================================
--- java/trunk/detector-data/detectors/HPS-PhysicsRun2016-4mm-v4-4/compact.xml (original)
+++ java/trunk/detector-data/detectors/HPS-PhysicsRun2016-4mm-v4-4/compact.xml Fri Feb 12 19:04:57 2016
@@ -33,7 +33,7 @@
<constant name="dipoleMagnetHeight" value="100*cm" />
<constant name="dipoleMagnetWidth" value="100*cm" />
<constant name="dipoleMagnetLength" value="108*cm" />
- <constant name="constBFieldY" value="-0.5" />
+ <constant name="constBFieldY" value="-0.524" />
<!-- ECAL crystal dimensions -->
@@ -91,17 +91,17 @@
<constant name="z02b" value="0+157.5+3.685" />
<!-- Global Millepede tweak parameters (survey constraints)-->
- <!--
- <constant name="dOmega_top" value="1.56e-5" />
- <constant name="dLambda_top" value="0.16e-3" />
- <constant name="dPhi_top" value="6.87e-3" />
- <constant name="dD0_top" value="-0.72" />
- <constant name="dZ0_top" value="-0.13" />
- <constant name="dOmega_bot" value="2.32e-5" />
- <constant name="dLambda_bot" value="-0.06e-3" />
- <constant name="dPhi_bot" value="17.92e-3" />
- <constant name="dD0_bot" value="-6.71" />
- <constant name="dZ0_bot" value="0.04" />
+ <!--
+ <constant name="dOmega_top" value="1.56e-5" />
+ <constant name="dLambda_top" value="0.16e-3" />
+ <constant name="dPhi_top" value="6.87e-3" />
+ <constant name="dD0_top" value="-0.72" />
+ <constant name="dZ0_top" value="-0.13" />
+ <constant name="dOmega_bot" value="2.32e-5" />
+ <constant name="dLambda_bot" value="-0.06e-3" />
+ <constant name="dPhi_bot" value="17.92e-3" />
+ <constant name="dD0_bot" value="-6.71" />
+ <constant name="dZ0_bot" value="0.04" />
-->
<!-- Global Millepede tweak parameters (mixed constraints: FEE momentum set at 1.05 GeV, top and bottom must agree on d0 and z0)-->
@@ -117,17 +117,17 @@
<constant name="dZ0_bot" value="0.116788238356" />
<!-- Global Millepede tweak parameters (external constraints)-->
- <!--
- <constant name="dOmega_top" value="0.1e-5" />
- <constant name="dLambda_top" value="0.5e-3" />
- <constant name="dPhi_top" value="1.5e-3" />
- <constant name="dD0_top" value="0.8" />
- <constant name="dZ0_top" value="-0.15" />
- <constant name="dOmega_bot" value="2.4e-5" />
- <constant name="dLambda_bot" value="1.5e-3" />
- <constant name="dPhi_bot" value="17e-3" />
- <constant name="dD0_bot" value="-5.6" />
- <constant name="dZ0_bot" value="0.2" />
+ <!--
+ <constant name="dOmega_top" value="0.1e-5" />
+ <constant name="dLambda_top" value="0.5e-3" />
+ <constant name="dPhi_top" value="1.5e-3" />
+ <constant name="dD0_top" value="0.8" />
+ <constant name="dZ0_top" value="-0.15" />
+ <constant name="dOmega_bot" value="2.4e-5" />
+ <constant name="dLambda_bot" value="1.5e-3" />
+ <constant name="dPhi_bot" value="17e-3" />
+ <constant name="dD0_bot" value="-5.6" />
+ <constant name="dZ0_bot" value="0.2" />
-->
</define>
@@ -781,24 +781,24 @@
</millepede_constants>
</detector>
-<!--
- <detector id="30" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsFieldDef" >
- <comment>Boundary planes for magnetic field, also used as scoring planes</comment>
- <module name="TestRunModuleFieldDef">
- <box x="416.052" y="177.8" />
- <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
- </module>
- <module name="TestRunModuleFieldDefFlare2">
- <box x="416.052" y="177.8+(327.66-177.8)*(dipoleMagnetPositionZ+dipoleMagnetLength/2-913.378)/385.572" />
- <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
- </module>
- <layer id="1">
- <module_placement name="TestRunModuleFieldDef" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ-dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
- </layer>
- <layer id="2">
- <module_placement name="TestRunModuleFieldDefFlare2" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ+dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
- </layer>
- </detector>
+<!--
+ <detector id="30" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsFieldDef" >
+ <comment>Boundary planes for magnetic field, also used as scoring planes</comment>
+ <module name="TestRunModuleFieldDef">
+ <box x="416.052" y="177.8" />
+ <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+ </module>
+ <module name="TestRunModuleFieldDefFlare2">
+ <box x="416.052" y="177.8+(327.66-177.8)*(dipoleMagnetPositionZ+dipoleMagnetLength/2-913.378)/385.572" />
+ <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+ </module>
+ <layer id="1">
+ <module_placement name="TestRunModuleFieldDef" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ-dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+ </layer>
+ <layer id="2">
+ <module_placement name="TestRunModuleFieldDefFlare2" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ+dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+ </layer>
+ </detector>
-->
<detector id="29" name="ECalScoring" type="HPSTracker2" readout="TrackerHitsECal" insideTrackingVolume="false">
@@ -864,9 +864,9 @@
</fields>
-->
- <fields>
- <field type="BoxDipole" name="AnalyzingDipole" x="dipoleMagnetPositionX" y="0*cm" z="dipoleMagnetPositionZ" dx="dipoleMagnetWidth/2.0" dy="dipoleMagnetHeight/2.0" dz="dipoleMagnetLength/2.0" bx="0.0" by="constBFieldY" bz="0.0" />
- </fields>
+ <fields>
+ <field type="BoxDipole" name="AnalyzingDipole" x="dipoleMagnetPositionX" y="0*cm" z="dipoleMagnetPositionZ" dx="dipoleMagnetWidth/2.0" dy="dipoleMagnetHeight/2.0" dz="dipoleMagnetLength/2.0" bx="0.0" by="constBFieldY" bz="0.0" />
+ </fields>
<includes>
<gdmlFile file="gdml/ecal_vacuum_flange_complete_v1.gdml" />
Modified: java/trunk/detector-data/detectors/HPS-PhysicsRun2016-Nominal-v4-4/HPS-PhysicsRun2016-Nominal-v4-4.lcdd
=============================================================================
--- java/trunk/detector-data/detectors/HPS-PhysicsRun2016-Nominal-v4-4/HPS-PhysicsRun2016-Nominal-v4-4.lcdd (original)
+++ java/trunk/detector-data/detectors/HPS-PhysicsRun2016-Nominal-v4-4/HPS-PhysicsRun2016-Nominal-v4-4.lcdd Fri Feb 12 19:04:57 2016
@@ -8335,7 +8335,7 @@
</setup>
</gdml>
<fields>
- <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="21.17" y="0.0" z="457.2" dx="500.0" dy="500.0" dz="540.0" bx="0.0" by="-0.5" bz="0.0" />
+ <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="21.17" y="0.0" z="457.2" dx="500.0" dy="500.0" dz="540.0" bx="0.0" by="-0.524" bz="0.0" />
</fields>
</lcdd>
Modified: java/trunk/detector-data/detectors/HPS-PhysicsRun2016-Nominal-v4-4/compact.xml
=============================================================================
--- java/trunk/detector-data/detectors/HPS-PhysicsRun2016-Nominal-v4-4/compact.xml (original)
+++ java/trunk/detector-data/detectors/HPS-PhysicsRun2016-Nominal-v4-4/compact.xml Fri Feb 12 19:04:57 2016
@@ -33,7 +33,7 @@
<constant name="dipoleMagnetHeight" value="100*cm" />
<constant name="dipoleMagnetWidth" value="100*cm" />
<constant name="dipoleMagnetLength" value="108*cm" />
- <constant name="constBFieldY" value="-0.5" />
+ <constant name="constBFieldY" value="-0.524" />
<!-- ECAL crystal dimensions -->
@@ -91,17 +91,17 @@
<constant name="z02b" value="0+157.5+3.685" />
<!-- Global Millepede tweak parameters (survey constraints)-->
- <!--
- <constant name="dOmega_top" value="1.56e-5" />
- <constant name="dLambda_top" value="0.16e-3" />
- <constant name="dPhi_top" value="6.87e-3" />
- <constant name="dD0_top" value="-0.72" />
- <constant name="dZ0_top" value="-0.13" />
- <constant name="dOmega_bot" value="2.32e-5" />
- <constant name="dLambda_bot" value="-0.06e-3" />
- <constant name="dPhi_bot" value="17.92e-3" />
- <constant name="dD0_bot" value="-6.71" />
- <constant name="dZ0_bot" value="0.04" />
+ <!--
+ <constant name="dOmega_top" value="1.56e-5" />
+ <constant name="dLambda_top" value="0.16e-3" />
+ <constant name="dPhi_top" value="6.87e-3" />
+ <constant name="dD0_top" value="-0.72" />
+ <constant name="dZ0_top" value="-0.13" />
+ <constant name="dOmega_bot" value="2.32e-5" />
+ <constant name="dLambda_bot" value="-0.06e-3" />
+ <constant name="dPhi_bot" value="17.92e-3" />
+ <constant name="dD0_bot" value="-6.71" />
+ <constant name="dZ0_bot" value="0.04" />
-->
<!-- Global Millepede tweak parameters (mixed constraints: FEE momentum set at 1.05 GeV, top and bottom must agree on d0 and z0)-->
@@ -117,17 +117,17 @@
<constant name="dZ0_bot" value="0.116788238356" />
<!-- Global Millepede tweak parameters (external constraints)-->
- <!--
- <constant name="dOmega_top" value="0.1e-5" />
- <constant name="dLambda_top" value="0.5e-3" />
- <constant name="dPhi_top" value="1.5e-3" />
- <constant name="dD0_top" value="0.8" />
- <constant name="dZ0_top" value="-0.15" />
- <constant name="dOmega_bot" value="2.4e-5" />
- <constant name="dLambda_bot" value="1.5e-3" />
- <constant name="dPhi_bot" value="17e-3" />
- <constant name="dD0_bot" value="-5.6" />
- <constant name="dZ0_bot" value="0.2" />
+ <!--
+ <constant name="dOmega_top" value="0.1e-5" />
+ <constant name="dLambda_top" value="0.5e-3" />
+ <constant name="dPhi_top" value="1.5e-3" />
+ <constant name="dD0_top" value="0.8" />
+ <constant name="dZ0_top" value="-0.15" />
+ <constant name="dOmega_bot" value="2.4e-5" />
+ <constant name="dLambda_bot" value="1.5e-3" />
+ <constant name="dPhi_bot" value="17e-3" />
+ <constant name="dD0_bot" value="-5.6" />
+ <constant name="dZ0_bot" value="0.2" />
-->
</define>
@@ -781,24 +781,24 @@
</millepede_constants>
</detector>
-<!--
- <detector id="30" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsFieldDef" >
- <comment>Boundary planes for magnetic field, also used as scoring planes</comment>
- <module name="TestRunModuleFieldDef">
- <box x="416.052" y="177.8" />
- <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
- </module>
- <module name="TestRunModuleFieldDefFlare2">
- <box x="416.052" y="177.8+(327.66-177.8)*(dipoleMagnetPositionZ+dipoleMagnetLength/2-913.378)/385.572" />
- <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
- </module>
- <layer id="1">
- <module_placement name="TestRunModuleFieldDef" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ-dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
- </layer>
- <layer id="2">
- <module_placement name="TestRunModuleFieldDefFlare2" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ+dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
- </layer>
- </detector>
+<!--
+ <detector id="30" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsFieldDef" >
+ <comment>Boundary planes for magnetic field, also used as scoring planes</comment>
+ <module name="TestRunModuleFieldDef">
+ <box x="416.052" y="177.8" />
+ <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+ </module>
+ <module name="TestRunModuleFieldDefFlare2">
+ <box x="416.052" y="177.8+(327.66-177.8)*(dipoleMagnetPositionZ+dipoleMagnetLength/2-913.378)/385.572" />
+ <module_component thickness="scoringThickness" material = "Vacuum" sensitive="true"/>
+ </module>
+ <layer id="1">
+ <module_placement name="TestRunModuleFieldDef" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ-dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+ </layer>
+ <layer id="2">
+ <module_placement name="TestRunModuleFieldDefFlare2" id="0" x="dipoleMagnetPositionX" y="0" z="dipoleMagnetPositionZ+dipoleMagnetLength/2" rx="0" ry="0" rz="-PI/2"/>
+ </layer>
+ </detector>
-->
<detector id="29" name="ECalScoring" type="HPSTracker2" readout="TrackerHitsECal" insideTrackingVolume="false">
@@ -864,9 +864,9 @@
</fields>
-->
- <fields>
- <field type="BoxDipole" name="AnalyzingDipole" x="dipoleMagnetPositionX" y="0*cm" z="dipoleMagnetPositionZ" dx="dipoleMagnetWidth/2.0" dy="dipoleMagnetHeight/2.0" dz="dipoleMagnetLength/2.0" bx="0.0" by="constBFieldY" bz="0.0" />
- </fields>
+ <fields>
+ <field type="BoxDipole" name="AnalyzingDipole" x="dipoleMagnetPositionX" y="0*cm" z="dipoleMagnetPositionZ" dx="dipoleMagnetWidth/2.0" dy="dipoleMagnetHeight/2.0" dz="dipoleMagnetLength/2.0" bx="0.0" by="constBFieldY" bz="0.0" />
+ </fields>
<includes>
<gdmlFile file="gdml/ecal_vacuum_flange_complete_v1.gdml" />
