Merge pull request #20 from project8/develop

Develop
project8 · May 8, 2018 · 70018de · 70018de
2 parents 2a4c7e2 + 8dce182
commit 70018de
Show file tree

Hide file tree

Showing 25 changed files with 2,128 additions and 167 deletions.
diff --git a/Config/Project8_JustKass.xml b/Config/Project8_JustKass.xml
@@ -21,8 +21,8 @@
 <external_define name="pressure" value="1.e0"/>
 <external_define name="cut" value="1.e3"/>
 
- <external_define name="generator" value="gen_uniform"/>
-<!-- <external_define name="generator" value="gen_krypton"/> -->
+<!-- <external_define name="generator" value="gen_uniform"/> -->
+ <external_define name="generator" value="gen_krypton"/> 
 <!-- <external_define name="generator" value="gen_bfieldlines" />  -->
  <external_define name="trajectory" value="traj_adiabaticsynchrotron"/>
 <!-- <external_define name="trajectory" value="traj_magnetic"/>  -->
@@ -361,8 +361,8 @@
     <ksnav_surface name="nav_surface"/>
 
     <!-- terminators -->
-    <ksterm_max_time name="term_max_time" time="1.0e-6"/>
-    <ksterm_min_energy name="term_min_energy" energy="[cut]"/>
+    <ksterm_max_time name="term_max_time" time="1.0e-7"/>
+    <ksterm_min_energy name="term_min_energy" energy="25000."/>
     <ksterm_min_z name="term_min_z" z="-.0482"/>
     <ksterm_max_z name="term_max_z" z=".0482"/>
 
@@ -442,7 +442,7 @@
         <command parent="root_terminator" field="add_terminator" child="term_min_z"/>
         <command parent="root_terminator" field="add_terminator" child="term_max_z"/>
         <command parent="root_terminator" field="add_terminator" child="term_max_time"/>
-<!--        <command parent="root_terminator" field="add_terminator" child="term_min_energy"/> -->
+        <command parent="root_terminator" field="add_terminator" child="term_min_energy"/> 
         <geo_space name="space_waveguide" spaces="world/project8/waveguide">
 <!--            <command parent="root_space_interaction" field="add_space_interaction" child="int_hydrogen"/> -->
 	    <!--<command parent="root_terminator" field="add_terminator" child="term_max_time"/>-->
@@ -464,7 +464,7 @@
     <ks_simulation
         run="1"
         seed="[seed]"
-        events="1"
+        events="20"
         magnetic_field="field_magnetic_traps"
         magnetic_field="field_magnetic_main"
         space="space_world"

diff --git a/Config/Tutorial/LocustTemplate.json b/Config/Tutorial/LocustTemplate.json
@@ -1,18 +1,23 @@
 {
     "generators":
     [          
-        "kass-signal",
-        "lpf-fft",
-        "decimate-signal",
-        "gaussian-noise",
-        "digitizer"
+       "kass-signal",
+       "lpf-fft",
+       "decimate-signal", 
+       "digitizer"
     ],
 
     "kass-signal":
     {
         "lo-frequency": 25.3106e9,
-        "xml-filename": "/cmn/p8/locust_mc/Config/Tutorial/Project8Phase1_WithRoot_Template.xml",
-        "pitchangle-filename": "/cmn/p8/locust_mc/cbuild/bin/pitchangles.txt"
+        "xml-filename": "/home/penny/locust_mc/Config/Tutorial/Project8Phase1_WithRoot_Template.xml",
+        "pitchangle-filename": "/home/penny/locust_mc/cbuild/bin/pitchangles.txt"
+    },
+
+    "patch-signal":
+    {
+        "lo-frequency": 25.8781e9,
+        "xml-filename": "/home/penny/locust_mc/Config/Tutorial/Project8Phase3_WithRoot_Template.xml"
     },
 
     "freefield-signal":
@@ -23,7 +28,7 @@
 
     "simulation":
     {
-        "egg-filename": "/cmn/p8/locust_mc/cbuild/bin/locust_mc_josh.egg",
+        "egg-filename": "/home/penny/locust_mc/cbuild/bin/locust_mc.egg",
         "n-records": 1,
         "record-size": 4194304
     },
@@ -36,8 +41,8 @@
 
     "digitizer":
     {
-    "v-range": 6.0e-6,
-    "v-offset": -3.0e-6
+    "v-range": 1.0e-5,
+    "v-offset": -0.5e-5
     }
 
 }

diff --git a/Config/Tutorial/Project8Phase1_WithRoot_Template.xml b/Config/Tutorial/Project8Phase1_WithRoot_Template.xml
@@ -30,7 +30,7 @@
 
 
 <geometry>
-    <include name="/cmn/p8/locust_mc/Config/Tutorial/Project8Phase1Geometry.xml"/>
+    <include name="/home/penny/locust_mc/Config/Tutorial/Project8Phase1Geometry.xml"/>
 </geometry>
 
     <!-- solenoid turns -->
@@ -192,7 +192,7 @@
 
     <ksgen_generator_composite name="gen_uniform" pid="11">
         <energy_composite>
-            <energy_fix value="30472.3"/>
+            <energy_fix value="31000."/>
         </energy_composite>
         <position_rectangular_composite space="world/project8">
             <x_uniform value_min="0." value_max="0.0"/>
@@ -201,7 +201,7 @@
         </position_rectangular_composite>
         <direction_spherical_composite space="world/project8">
 <!--            <theta_spherical angle_min="89.9" angle_max="90"/>  -->
-        <theta_uniform value_min="89.9" value_max="90.1"/> 
+        <theta_uniform value_min="90." value_max="90."/> 
             <phi_uniform value_min="0." value_max="0."/>
         </direction_spherical_composite>
         <time_composite>

diff --git a/Config/Tutorial/Project8Phase2_WithRoot_Template.xml b/Config/Tutorial/Project8Phase2_WithRoot_Template.xml
@@ -3,22 +3,21 @@
 
 <external_define name="simulation" value="1"/>
 
-<external_define name="pinch" value="1.e-5"/> <!-- -1.0 for harmonic, 1.e-5 for bathtub due to apparent slow performance with 0.0 value -->
-<external_define name="bathtub" value="1.0"/>  <!-- 1.0 for bathtub -->
+<external_define name="pinch" value="-0.03125"/> <!-- -1.0 for harmonic, 1.e-5 for bathtub due to apparent slow performance with 0.0 value -->
+<external_define name="bathtub" value="1.e-5"/>  <!-- 1.0 for bathtub -->
 <external_define name="fieldZ" value="0.9583"/> <!-- no tilt -->
 <!--<external_define name="fieldZ" value="0.9581540"/> -->
 <external_define name="fieldX" value="0.0"/>  <!-- earth's horiz. field in Seattle -->
 <external_define name="fieldY" value="0.0"/>
 
-
 <external_define name="alignment" value="0."/>
 
- <external_define name="generator" value="gen_uniform"/>
-<!-- <external_define name="generator" value="gen_krypton"/> -->
-<!-- <external_define name="generator" value="gen_bfieldlines" />  -->
- <external_define name="trajectory" value="traj_adiabaticsynchrotron"/>
+<!-- <external_define name="generator" value="gen_uniform"/> -->
+<!-- <external_define name="generator" value="gen_betadecay"/>  -->
+ <external_define name="generator" value="gen_bfieldlines" />
+<!-- <external_define name="trajectory" value="traj_adiabaticsynchrotron"/> -->
 <!-- <external_define name="trajectory" value="trajectory_exact"/> -->
-<!-- <external_define name="trajectory" value="traj_magnetic"/>  -->
+ <external_define name="trajectory" value="traj_magnetic"/> 
 <external_define name="cyclotrons" value="1"/>
 
 <external_define name="count" value="1"/>
@@ -30,7 +29,7 @@
 
 
 <geometry>
-    <include name="/home/hep/baker/ps48/locust_mc/Config/Tutorial/Project8Phase2Geometry.xml"/>
+    <include name="/home/penny/locust_mc/Config/Tutorial/Project8Phase2AuxCoilGeometry.xml"/>
 </geometry>
 
     <!-- solenoid turns -->
@@ -46,19 +45,22 @@
     <electromagnet name="electromagnet_solenoid" spaces="world/project8/@upstream_bathtub_coil_tag" current="{ [bathtub] * [bathtub_turns] }"/> 
 
 
-    <electromagnet name="electromagnet_solenoid" spaces="world/project8/@upstream_pinch_coil_tag" current="{ [pinch] * [pinch_turns] }"/> 
+    <electromagnet name="electromagnet_solenoid" spaces="world/project8/@upstream_pinch_coil_tag" current="{ [bathtub] * [pinch_turns] }"/> 
 
 
     <electromagnet name="electromagnet_solenoid" spaces="world/project8/@center_pinch_coil_tag" current="{ [pinch] * [pinch_turns] }"/> 
 
 
-    <electromagnet name="electromagnet_solenoid" spaces="world/project8/@downstream_pinch_coil_tag" current="{ [pinch] * [pinch_turns] }"/> 
+    <electromagnet name="electromagnet_solenoid" spaces="world/project8/@downstream_pinch_coil_tag" current="{ [bathtub] * [pinch_turns] }"/> 
 
 
 
     <electromagnet name="electromagnet_solenoid" spaces="world/project8/@downstream_bathtub_coil_tag" current="{ [bathtub] * [bathtub_turns] }"/> 
 
 
+    <electromagnet name="electromagnet_solenoid" spaces="world/project8/@aux_coil_tag" current="{ [bathtub] * 1}"/> 
+
+
 
 </geometry>
 
@@ -200,16 +202,16 @@
 
     <ksgen_generator_composite name="gen_uniform" pid="11">
         <energy_composite>
-            <energy_fix value="30472.3"/>
+            <energy_fix value="18600."/>
         </energy_composite>
         <position_rectangular_composite space="world/project8">
-            <x_uniform value_min="-0.005" value_max="0.005"/>
-            <y_uniform value_min="-0.002" value_max="0.002"/>
-            <z_uniform value_min="-0.026" value_max="0.026"/>
+            <x_uniform value_min="0." value_max="0."/>
+            <y_uniform value_min="0." value_max="0."/>
+            <z_uniform value_min="0." value_max="0."/>
         </position_rectangular_composite>
         <direction_spherical_composite space="world/project8">
 <!--            <theta_spherical angle_min="89.9" angle_max="90"/>  -->
-        <theta_uniform value_min="0.0" value_max="360.0"/>
+        <theta_uniform value_min="90." value_max="90."/>
             <phi_uniform value_min="0." value_max="0."/>
         </direction_spherical_composite>
         <time_composite>
@@ -219,6 +221,25 @@
 
 
 
+    <ksgen_generator_composite name="gen_betadecay">
+        <energy_beta_decay min_energy="16400."/>
+        <position_rectangular_composite space="world/project8">
+            <x_uniform value_min="0.0" value_max="0.0"/>
+            <y_uniform value_min="0.0" value_max="0.0"/>
+            <z_uniform value_min="0.0" value_max="0.0"/>
+        </position_rectangular_composite>
+        <direction_spherical_composite space="world/project8">
+            <theta_spherical angle_min="90." angle_max="90."/>
+            <phi_uniform value_min="0." value_max="360"/>
+        </direction_spherical_composite>
+        <time_composite>
+            <time_fix value="0."/>
+        </time_composite>
+    </ksgen_generator_composite>
+
+
+
+
 
 
 
@@ -411,18 +432,19 @@
 
 
     <!-- terminators -->
-    <ksterm_max_time name="term_max_time" time="5.e-7"/>
+    <ksterm_max_time name="term_max_time" time="0.5e-7"/>
     <ksterm_max_steps name="term_max_steps" steps="10000"/>
     <ksterm_min_energy name="term_min_energy" energy="0."/>
     <ksterm_min_z name="term_min_z" z="-.07"/>
     <ksterm_max_z name="term_max_z" z=".07"/>
+    <ksterm_max_r name="term_max_r" r=".005"/>
     <ksterm_death name="term_upstream_endcap_death"/>
     <ksterm_death name="term_downstream_endcap_death"/>
     <ksterm_death name="term_waveguide_jacket_death"/>
 
 
     <!-- modifiers -->
-    <cycl_rad_extr name="my_rad_extr" P8Phase="2" /> 
+<!--    <cycl_rad_extr name="my_rad_extr" P8Phase="2" /> -->
 
 
     <!-- writers -->
@@ -492,17 +514,18 @@
     <!-- navigation -->
 
     <ksgeo_space name="space_world" spaces="world">
-        <command parent="root_step_modifier" field="add_modifier" child="my_rad_extr"/>
+<!--        <command parent="root_step_modifier" field="add_modifier" child="my_rad_extr"/> -->
 <!--        <command parent="root_terminator" field="add_terminator" child="term_max_steps"/> -->
 
-        <command parent="root_terminator" field="add_terminator" child="term_max_time"/>
+<!--        <command parent="root_terminator" field="add_terminator" child="term_max_time"/> -->
 
+<!--        <command parent="root_terminator" field="add_terminator" child="term_max_r"/> -->
         <command parent="root_terminator" field="add_terminator" child="term_max_z"/>
         <command parent="root_terminator" field="add_terminator" child="term_min_z"/>
 <!--        <command parent="root_terminator" field="add_terminator" child="term_min_energy"/>  -->
 <!--        <command parent="trajectory_exact" field="add_control" child="control_cyclotron_1_16"/> -->
         <command parent="write_root" field="add_track_output" child="component_track_world"/>
-        <command parent="write_root" field="add_step_output" child="component_step_world"/> 
+        <command parent="write_root" field="add_step_output" child="component_step_world"/>
 
         <geo_surface name="upstream_endcap_death" surfaces="world/project8/cylindricalwaveguide/upstream_endcap_piece">
             <command parent="root_terminator" field="add_terminator" child="term_upstream_endcap_death"/>
@@ -539,7 +562,7 @@
         name="project8_simulation"
         run="1"
         seed="[seed]"
-        events="10000"
+        events="25"
         magnetic_field="field_electromagnet"
         magnetic_field="field_magnetic_main"
         space="space_world"
@@ -554,7 +577,7 @@
 
 </kassiopeia>
 
-<!--
+
 
     <vtk_window
         name="vtk_window"
@@ -589,7 +612,6 @@
         /> 
 
     </vtk_window> 
--->