Skip to content

Commit

Permalink
Merge pull request #22 from project8/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
pslocum authored Jun 27, 2018
2 parents fd8078f + edc745e commit 3873961
Show file tree
Hide file tree
Showing 42 changed files with 4,383 additions and 186 deletions.
50 changes: 50 additions & 0 deletions Config/NNPSSTutorial/#LocustTutorialTemplate.json#
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"generators":
[
"kass-signal",
"lpf-fft",
"decimate-signal",
"gaussian-noise",
"digitizer"
],

"kass-signal":
{
"lo-frequency": 25.3106e9,
"pitchangle-filename": "pitchangles.txt",
"xml-filename": "/home/hep/baker/ps48/locust_mc/Config/NNPSSTutorial/Project8Tutorial_WithVTK_Template.xml"
},

"patch-signal":
{
"lo-frequency": 25.8781e9,
"xml-filename": "/home/penny/locust_mc/Config/Tutorial/Project8Phase3_WithRoot_Template.xml"
},

"freefield-signal":
{
"lo-frequency": 25.2814e9,
"xml-filename": "/home/penny/locust_mc/Config/Tutorial/Project8Phase3_WithRoot_Template.xml"
},

"simulation":
{
"egg-filename": "locust_mc.egg",
"n-records": 1,
"record-size": 4194304
},

"gaussian-noise":
{
"noise-floor": 4.0e-21,
"domain": "time"
},

"digitizer":
{
"v-range": 1.0e-6,
"v-offset": -0.5e-6
}

}

47 changes: 47 additions & 0 deletions Config/NNPSSTutorial/LocustFieldMap.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"generators":
[
"kass-signal",
"digitizer"
],

"kass-signal":
{
"lo-frequency": 25.3106e9,
"pitchangle-filename": "pitchangles.txt",
"xml-filename": "/home/hep/baker/ps48/locust_mc/Config/NNPSSTutorial/Project8Tutorial_FieldMap_Template.xml"
},

"patch-signal":
{
"lo-frequency": 25.8781e9,
"xml-filename": "/home/hep/baker/ps48/locust_mc/Config/Tutorial/Project8Phase3_WithRoot_Template.xml"
},

"freefield-signal":
{
"lo-frequency": 25.2814e9,
"xml-filename": "/home/hep/baker/ps48/locust_mc/Config/Tutorial/Project8Phase3_WithRoot_Template.xml"
},

"simulation":
{
"egg-filename": "locust_mc.egg",
"n-records": 1,
"record-size": 4194304
},

"gaussian-noise":
{
"noise-floor": 4.0e-21,
"domain": "time"
},

"digitizer":
{
"v-range": 1.0e-6,
"v-offset": -0.5e-6
}

}

50 changes: 50 additions & 0 deletions Config/NNPSSTutorial/LocustPhase3Template.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"generators":
[
"patch-signal",
"lpf-fft",
"decimate-signal",
"digitizer"
],

"kass-signal":
{
"lo-frequency": 25.3106e9,
"pitchangle-filename": "pitchangles.txt",
"xml-filename": "/home/hep/baker/ps48/locust_mc/Config/Tutorial/Project8Phase1_WithRoot_Template.xml"
},

"patch-signal":
{
"lo-frequency": 25.8781e9,
"xml-filename": "/home/hep/baker/ps48/locust_mc/Config/NNPSSTutorial/Project8Phase3_WithRoot_Template.xml"
},

"freefield-signal":
{
"lo-frequency": 25.2814e9,
"xml-filename": "/home/hep/baker/ps48/locust_mc/Config/Tutorial/Project8Phase3_WithRoot_Template.xml"
},

"simulation":
{
"egg-filename": "locust_mc.egg",
"n-records": 1,
"record-size": 163840,
"n-channels": 30
},

"gaussian-noise":
{
"noise-floor": 4.0e-22,
"domain": "time"
},

"digitizer":
{
"v-range": 5.0e-6,
"v-offset": -2.5e-6
}

}

54 changes: 54 additions & 0 deletions Config/NNPSSTutorial/LocustSineWave.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"generators":
[
"test-signal",
"lpf-fft",
"decimate-signal",
"digitizer"
],

"test-signal":
{
"lo-frequency": 20.15e9
},

"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/NNPSSTutorial/Project8Tutorial_WithVTK_Template.xml"
},

"patch-signal":
{
"lo-frequency": 25.8781e9,
"xml-filename": "/home/hep/baker/ps48/locust_mc/Config/Tutorial/Project8Phase3_WithRoot_Template.xml"
},

"freefield-signal":
{
"lo-frequency": 25.2814e9,
"xml-filename": "/home/hep/baker/ps48/locust_mc/Config/Tutorial/Project8Phase3_WithRoot_Template.xml"
},

"simulation":
{
"egg-filename": "locust_mc.egg",
"n-records": 1,
"record-size": 4194304
},

"gaussian-noise":
{
"noise-floor": 4.0e-21,
"domain": "time"
},

"digitizer":
{
"v-range": 1.0e-6,
"v-offset": -0.5e-6
}

}

50 changes: 50 additions & 0 deletions Config/NNPSSTutorial/LocustTutorialTemplate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"generators":
[
"kass-signal",
"lpf-fft",
"decimate-signal",
"gaussian-noise",
"digitizer"
],

"kass-signal":
{
"lo-frequency": 25.3106e9,
"pitchangle-filename": "pitchangles.txt",
"xml-filename": "/home/hep/baker/ps48/locust_mc/Config/NNPSSTutorial/Project8Tutorial_WithVTK_Template.xml"
},

"patch-signal":
{
"lo-frequency": 25.8781e9,
"xml-filename": "/home/penny/locust_mc/Config/Tutorial/Project8Phase3_WithRoot_Template.xml"
},

"freefield-signal":
{
"lo-frequency": 25.2814e9,
"xml-filename": "/home/penny/locust_mc/Config/Tutorial/Project8Phase3_WithRoot_Template.xml"
},

"simulation":
{
"egg-filename": "locust_mc.egg",
"n-records": 1,
"record-size": 4194304
},

"gaussian-noise":
{
"noise-floor": 4.0e-21,
"domain": "time"
},

"digitizer":
{
"v-range": 1.0e-6,
"v-offset": -0.5e-6
}

}

Binary file added Config/NNPSSTutorial/NNPSSTutorial.pdf
Binary file not shown.
119 changes: 119 additions & 0 deletions Config/NNPSSTutorial/Project8Phase1Geometry.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@

<!-- waveguide -->

<tag name="project8_rectangular_waveguide_tag">
<box_space
name="new_rectangularwaveguide_space"
xa="-0.005334"
xb="0.005334"
x_mesh_count="10"
x_mesh_power="1."
ya="-0.002159"
yb="0.002159"
y_mesh_count="10"
y_mesh_power="1."
za="-0.0381"
zb="0.0381"
z_mesh_count="10"
z_mesh_power="1."
/>
</tag>


<!-- pinch coil -->

<tag name="magnet_tag" name="center_pinch_coil_tag">
<cylinder_tube_space
name="center_pinch_coil_space"
z1="-.00381"
z2=".00381"
longitudinal_mesh_count="10"
longitudinal_mesh_power="1."
r1="0.0065024"
r2="0.0096774"
radial_mesh_count="30"
radial_mesh_power="1."
axial_mesh_count="128"
/>
</tag>

<!-- bathtub coils -->

<tag name="magnet_tag" name="upstream_bathtub_coil_tag">
<cylinder_tube_space
name="upstream_bathtub_coil_space"
z1="-.003175"
z2=".003175"
longitudinal_mesh_count="10"
longitudinal_mesh_power="1."
r1="0.0065024"
r2="0.0096774"
radial_mesh_count="30"
radial_mesh_power="1."
axial_mesh_count="128"
/>
</tag>

<tag name="magnet_tag" name="downstream_bathtub_coil_tag">
<cylinder_tube_space
name="downstream_bathtub_coil_space"
z1="-.003175"
z2=".003175"
longitudinal_mesh_count="10"
longitudinal_mesh_power="1."
r1="0.0065024"
r2="0.0096774"
radial_mesh_count="30"
radial_mesh_power="1."
axial_mesh_count="128"
/>
</tag>


<!-- assembly -->

<space name="project8_assembly">

<space name="center_pinch_coil" node="center_pinch_coil_space">
<transformation rotation_euler="0. 0. 0."/>
<transformation displacement="{0.} {0.} {0.0}"/>
</space>
<space name="upstream_bathtub_coil" node="upstream_bathtub_coil_space">
<transformation rotation_euler="0. 1. 0."/>
<transformation displacement="{0.} {0.} {0.027051}"/>
</space>
<space name="downstream_bathtub_coil" node="downstream_bathtub_coil_space">
<transformation rotation_euler="0. -1. 0."/>
<transformation displacement="{0.} {0.} {-0.027051}"/>
</space>

<space name="rectangularwaveguide" node="new_rectangularwaveguide_space"/>


</space>




<cylinder_space name="world_space" z1="-50" z2="50" r="20"/>
<space name="world" node="world_space">
<space name="project8" tree="project8_assembly">
<transformation rotation_axis_angle="[alignment] 90. 90."/>
</space>
</space>




<appearance name="app_magnet" color="0 255 96 96" arc="72" surfaces="world/project8/upstream_bathtub_coil/#"/>
<appearance name="app_magnet" color="0 255 96 96" arc="72" surfaces="world/project8/center_pinch_coil/#"/>
<appearance name="app_magnet" color="0 255 96 96" arc="72" surfaces="world/project8/downstream_bathtub_coil/#"/>
<appearance name="app_waveguide" color="255 128 0 96" arc="72" surfaces="world/project8/rectangularwaveguide/top"/>
<appearance name="app_waveguide" color="255 128 0 96" arc="72" surfaces="world/project8/rectangularwaveguide/bottom"/>
<appearance name="app_waveguide" color="255 128 0 96" arc="72" surfaces="world/project8/rectangularwaveguide/jacket"/>




<!-- appearance -->

Loading

0 comments on commit 3873961

Please sign in to comment.