fix ideal antisolenoid field

aciarma · Sep 2, 2024 · b121ae3 · b121ae3
1 parent 51825b6
commit b121ae3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 28 deletions.
diff --git a/FCCee/MDI/compact/MDI_o1_v00/MDI_standalone.xml b/FCCee/MDI/compact/MDI_o1_v00/MDI_standalone.xml
@@ -57,9 +57,8 @@
   <!-- <include ref="FFQuads_params_v572_T.xml"/>-->
   <include ref="FFQuads_v01.xml"/>
 
-<!--  <include ref="fields_solenoid.xml"/>
-  <include ref="fields_antisol_map.xml"/>-->
-  <!-- <include ref="${k4geo_DIR}/ILD/compact/ILD_common_v02/Field_AntiDID_Map_l.xml"/> -->
-  <!-- <include ref="fields_antisol_ideal.xml"/> -->
+  <include ref="fields_solenoid.xml"/>
+  <!--<include ref="fields_antisol_map.xml"/>-->
+  <include ref="fields_antisol_ideal.xml"/>
 
 </lccdd>
diff --git a/FCCee/MDI/compact/MDI_o1_v00/fields_antisol_ideal.xml b/FCCee/MDI/compact/MDI_o1_v00/fields_antisol_ideal.xml
@@ -9,45 +9,34 @@
   </define>
 
     <fields>
-      <field name="GlobalSolenoid" type="solenoid"
-             inner_field="SolenoidField"
-             outer_field="-1.0*tesla"
-             zmax="Solenoid_Coil_half_length"
-             outer_radius="Solenoid_Coil_radius">
-      </field>
-
       <field name="CompensatingSolenoidZplus" type="solenoid"
-             inner_field="-SolenoidField -SolenoidField * QD0_min_z / ( QD0_min_z - CompSol_min_z)"
+             inner_field="-5*tesla"
              outer_field="0*tesla"
              zmax="QD0_min_z"
 	     zmin="CompSol_min_z"
              outer_radius="20*cm">
       </field>
-
       <field name="CompensatingSolenoidZminus" type="solenoid"
-             inner_field="-SolenoidField -SolenoidField * QD0_min_z / ( QD0_min_z - CompSol_min_z)"
+             inner_field="-5*tesla"
              outer_field="0*tesla"
              zmin="-QD0_min_z"
              zmax="-CompSol_min_z"
              outer_radius="20*cm">
       </field>
-
-      <!-- to check with the visualisation that this works... :
-      <field name="GlobalSolenoid" type="solenoid"
-             inner_field="SolenoidField"
-             outer_field="-1.5*tesla"
-             zmax="1*m"
-             outer_radius="Solenoid_Coil_radius">
+      <field name="ScreeningSolenoidZplus" type="solenoid"
+             inner_field="-2*tesla"
+             outer_field="0*tesla"
+             zmin="QD0_min_z+env_safety"
+             zmax="Solenoid_half_length"
+             outer_radius="20*cm">
       </field>
-      <field name="CompensatingSolenoid" type="solenoid"
-             inner_field="-SolenoidField"
+      <field name="ScreeningSolenoidZminus" type="solenoid"
+             inner_field="-2*tesla"
              outer_field="0*tesla"
-             zmax="3*m"
-             zmin="1*m"
-             outer_radius="Solenoid_Coil_radius">
+             zmax="-QD0_min_z-env_safety"
+             zmin="-Solenoid_half_length"
+             outer_radius="20*cm">
       </field>
--->
-
 
     </fields>