Merge pull request #82 from project8/develop

Develop

CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required( VERSION 3.1 )
 
 # Define the project
 cmake_policy( SET CMP0048 NEW ) # version in project()
-project( locust_mc VERSION 1.13.3)
+project( locust_mc VERSION 1.14.0)
 
 list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Scarab/cmake )
 include( PackageBuilder )
@@ -19,6 +19,10 @@ set_option( USE_CPP11 TRUE )
 option( locust_mc_BUILD_WITH_KASSIOPEIA "Option to build with Kassiopeia" FALSE )
 option( locust_mc_BUILD_WITH_ROOT "Option to build with ROOT" TRUE )
 
+# make the data install directory available as a preprocessor macro
+add_definitions( -DPB_DATA_INSTALL_DIR=${DATA_INSTALL_DIR} )
+
+
 #####################
 # locust submodules #
 #####################
@@ -157,6 +161,7 @@ include_directories (${ROOT_INCLUDE_DIR})
 ###########
 
 add_subdirectory( Source )
+add_subdirectory( Data )
 
 
 

Config/Tutorial/LocustPhase1Template.json

@@ -4,15 +4,14 @@
        "kass-signal",
        "lpf-fft",
        "decimate-signal", 
-       "gaussian-noise",
        "digitizer"
     ],
 
     "kass-signal":
     {
         "lo-frequency": 25.3106e9,
-        "pitchangle-filename": "/home/hep/baker/ps48/locust_mc/cbuild/bin/pitchangles.txt",
-        "xml-filename": "/home/hep/baker/ps48/locust_mc/Config/Tutorial/Project8Phase1_WithRoot_Template.xml"
+        "pitchangle-filename": "/home/penny/locust_mc/cbuild/bin/pitchangles.txt",
+        "xml-filename": "/home/penny/locust_mc/Config/Tutorial/Project8Phase1_WithRoot_Template.xml"
     },
 
     "patch-signal":
@@ -29,9 +28,9 @@
 
     "simulation":
     {
-        "egg-filename": "/home/hep/baker/ps48/locust_mc/cbuild/bin/locust_mc.egg",
+        "egg-filename": "/home/penny/locust_mc/cbuild/bin/locust_mc.egg",
         "n-records": 1,
-        "record-size": 4194304
+        "record-size": 819200
     },
 
     "gaussian-noise":
@@ -42,8 +41,8 @@
 
     "digitizer":
     {
-    "v-range": 4.0e-5,
-    "v-offset": -2.0e-5
+    "v-range": 4.0e-8,
+    "v-offset": -2.0e-8
     }
 
 }

Config/Tutorial/Project8Phase1_WithRoot_Template.xml

@@ -13,8 +13,8 @@
 
 <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_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="trajectory_exact"/> -->
@@ -30,7 +30,7 @@
 
 
 <geometry>
-    <include name="/home/hep/baker/ps48/locust_mc/Config/Tutorial/Project8Phase1Geometry.xml"/>
+    <include name="/home/penny/locust_mc/Config/Tutorial/Project8Phase1Geometry.xml"/>
 </geometry>
 
     <!-- solenoid turns -->
@@ -395,7 +395,7 @@
     <ksnav_surface name="nav_surface" transmission_split="true" reflection_split="false"/>
 
     <!-- terminators -->
-    <ksterm_max_time name="term_max_time" time="0.5e-3"/>
+    <ksterm_max_time name="term_max_time" time="5.0e-6"/>
     <ksterm_max_steps name="term_max_steps" steps="10000"/>
     <ksterm_min_energy name="term_min_energy" energy="25000."/>
     <ksterm_max_energy name="term_max_energy" energy="30430."/>
@@ -521,7 +521,7 @@
         name="project8_simulation"
         run="1"
         seed="[seed]"
-        events="100"
+        events="1"
         magnetic_field="field_electromagnet"
         magnetic_field="field_magnetic_main"
         space="space_world"

Data/CMakeLists.txt

@@ -0,0 +1,8 @@
+# CMakeLists.txt for Locust_mc/Data
+
+set( LOCUST_MC_DATA_FILES
+    H2OscillatorStrength.txt
+    KrOscillatorStrength.txt
+)
+
+pbuilder_install_data( ${LOCUST_MC_DATA_FILES} )