Skip to content

Commit

Permalink
Lengthened PreEventSampling in LMCKassSignalGenerator.
Browse files Browse the repository at this point in the history
  • Loading branch information
pslocum committed Feb 19, 2018
1 parent a929f58 commit 0669940
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 18 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pbuilder_prepare_project()

set_option( USE_CPP11 TRUE )

option( locust_mc_BUILD_WITH_KASSIOPEIA "Option to build with Kassiopeia" TRUE )
option( locust_mc_BUILD_WITH_KASSIOPEIA "Option to build with Kassiopeia" FALSE )

if (locust_mc_BUILD_WITH_KASSIOPEIA)
# Keep KasperDefaults from overriding the install prefix
Expand Down
8 changes: 4 additions & 4 deletions Config/Tutorial/LocustTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"kass-signal":
{
"lo-frequency": 25.3106e9,
"xml-filename": "/home/hep/baker/ps48/locust_mc/Config/Tutorial/Project8Phase1_WithRoot_Template.xml",
"pitchangle-filename": "/home/hep/baker/ps48/locust_mc/cbuild/bin/pitchangles.txt"
"xml-filename": "/cmn/p8/locust_mc/Config/Tutorial/Project8Phase1_WithRoot_Template.xml",
"pitchangle-filename": "/cmn/p8/locust_mc/cbuild/bin/pitchangles.txt"
},

"freefield-signal":
Expand All @@ -23,7 +23,7 @@

"simulation":
{
"egg-filename": "/home/hep/baker/ps48/locust_mc/cbuild/bin/locust_mc.egg",
"egg-filename": "/cmn/p8/locust_mc/cbuild/bin/locust_mc_josh.egg",
"n-records": 1,
"record-size": 4194304
},
Expand All @@ -36,7 +36,7 @@

"digitizer":
{
"v-range": 3.0e-6,
"v-range": 6.0e-6,
"v-offset": -3.0e-6
}

Expand Down
6 changes: 3 additions & 3 deletions Config/Tutorial/Project8Phase1_WithRoot_Template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@


<geometry>
<include name="/home/hep/baker/ps48/locust_mc/Config/Tutorial/Project8Phase1Geometry.xml"/>
<include name="/cmn/p8/locust_mc/Config/Tutorial/Project8Phase1Geometry.xml"/>
</geometry>

<!-- solenoid turns -->
Expand Down Expand Up @@ -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="90.0" value_max="90.0"/>
<theta_uniform value_min="89.9" value_max="90.1"/>
<phi_uniform value_min="0." value_max="0."/>
</direction_spherical_composite>
<time_composite>
Expand Down Expand Up @@ -521,7 +521,7 @@
name="project8_simulation"
run="1"
seed="[seed]"
events="1"
events="10"
magnetic_field="field_electromagnet"
magnetic_field="field_magnetic_main"
space="space_world"
Expand Down
10 changes: 1 addition & 9 deletions Config/Tutorial/katydid_new.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

"egg1":
{
"filename": "/cmn/p8/locust_mc/cbuild/bin/locust_mc.egg",
"filename": "/cmn/p8/locust_mc/cbuild/bin/locust_mc_test.egg",
"egg-reader": "egg3",
"number-of-slices": 500,
"slice-size": 8192,
Expand All @@ -82,11 +82,7 @@

"waterfall-writer":
{
<<<<<<< HEAD
"output-file": "/cmn/p8/locust_mc/cbuild/bin/katydidwaterfall.root",
=======
"output-file": "/home/hep/baker/ps48/locust_mc/cbuild/bin/katydidwaterfall.root",
>>>>>>> 5c80c82f8a91b2755d2b74889e757679614bd27a
"file-flag": "recreate",
"min-time": 0.0,
"max-time": 0.025,
Expand All @@ -98,11 +94,7 @@

"writer":
{
<<<<<<< HEAD
"output-file": "/cmn/p8/locust_mc/cbuild/bin/basic.root",
=======
"output-file": "/home/hep/baker/ps48/locust_mc/cbuild/bin/basic.root",
>>>>>>> 5c80c82f8a91b2755d2b74889e757679614bd27a
"file-flag": "recreate"
}

Expand Down
2 changes: 1 addition & 1 deletion Source/Generators/LMCKassSignalGenerator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ namespace locust
{
//n samples for event spacing.
int PreEventCounter = 0;
int NPreEventSamples = 150000;
int NPreEventSamples = 1500000;

//FILE *fp = fopen("timing.txt","wb"); // time stamp checking.
//fprintf(fp, "testing\n");
Expand Down

0 comments on commit 0669940

Please sign in to comment.