Merge remote-tracking branch 'origin/develop'

project8 · Jul 15, 2023 · 8fe4fd8 · 8fe4fd8
2 parents 52a8690 + 72a4e92
commit 8fe4fd8
Show file tree

Hide file tree

Showing 33 changed files with 751 additions and 762 deletions.
diff --git a/Config/CMakeLists.txt b/Config/CMakeLists.txt
@@ -13,7 +13,6 @@ configure_file( LocustCavity1GHz.json.in LocustCavity1GHz.json )
 configure_file( LocustFreeSpaceTemplate.json.in LocustFreeSpaceTemplate.json )
 configure_file( LocustPlaneWaveTemplate.json.in LocustPlaneWaveTemplate.json )
 configure_file( LocustFakeTrack.json.in LocustFakeTrack.json )
-configure_file( LocustMagDipoleAntennaTemplate.json.in LocustMagDipoleAntennaTemplate.json )
 configure_file( LocustTestSignal.json.in LocustTestSignal.json )
 configure_file( plotfieldmap.c.in plotfieldmap.c )
 configure_file( katydid.json.in katydid.json )
@@ -28,17 +27,15 @@ set (EXAMPLE_CONFIGFILES
     ${CMAKE_CURRENT_BINARY_DIR}/LocustKass_FreeSpace_Template.xml 
     ${CMAKE_CURRENT_BINARY_DIR}/LocustKass_Cavity_CCA.xml 
     ${CMAKE_CURRENT_BINARY_DIR}/LocustKass_Cavity_1GHz.xml     
-    WaveguideGeometry.xml
     FreeSpaceGeometry.xml
-	CavityGeometry_V00_00_00.xml
 	CavityGeometry_VTinyCoil.xml
+	WaveguideGeometry_VTinyCoil.xml
     ${CMAKE_CURRENT_BINARY_DIR}/LocustWaveguideTemplate.json
     ${CMAKE_CURRENT_BINARY_DIR}/LocustCavityCCA.json
     ${CMAKE_CURRENT_BINARY_DIR}/LocustCavity1GHz.json
     ${CMAKE_CURRENT_BINARY_DIR}/LocustFreeSpaceTemplate.json
     ${CMAKE_CURRENT_BINARY_DIR}/LocustPlaneWaveTemplate.json
     ${CMAKE_CURRENT_BINARY_DIR}/LocustFakeTrack.json
-    ${CMAKE_CURRENT_BINARY_DIR}/LocustMagDipoleAntennaTemplate.json
     ${CMAKE_CURRENT_BINARY_DIR}/LocustTestSignal.json
     ${CMAKE_CURRENT_BINARY_DIR}/katydid.json
     ${CMAKE_CURRENT_BINARY_DIR}/ChannelAggregatorConfig.yaml

diff --git a/Config/CavityGeometry_V00_00_00.xml b/Config/CavityGeometry_V00_00_00.xml
diff --git a/Config/CavityGeometry_VTinyCoil.xml b/Config/CavityGeometry_VTinyCoil.xml
@@ -40,6 +40,7 @@
 
 <!-- assembly -->
 <space name="project8_assembly">
+
 <space name="coil_000" node="coil_space_000">
   <transformation rotation_euler="0. 0. 0."/> 
 

diff --git a/Config/LocustCavity1GHz.json.in b/Config/LocustCavity1GHz.json.in
@@ -17,7 +17,7 @@
         "dho-time-resolution": 1.0e-9,
         "dho-threshold-factor": 0.01,
         "event-spacing-samples": 10,
-        "e-gun": false,        
+        "rectangular-waveguide": false,        
         "voltage-check": "false",
         "lo-frequency": 1.065e9,
         "xml-filename": "${CMAKE_INSTALL_PREFIX}/config/LocustKass_Cavity_1GHz.xml"

diff --git a/Config/LocustCavityCCA.json.in b/Config/LocustCavityCCA.json.in
@@ -17,7 +17,7 @@
         "dho-time-resolution": 9.0e-11,
         "dho-threshold-factor": 0.01,
         "event-spacing-samples": 10,
-        "e-gun": false,        
+        "rectangular-waveguide": false,        
         "voltage-check": "false",
         "lo-frequency": 25.9602e9,
         "xml-filename": "${CMAKE_INSTALL_PREFIX}/config/LocustKass_Cavity_CCA.xml"

diff --git a/Config/LocustKass_Waveguide_Template.xml.in b/Config/LocustKass_Waveguide_Template.xml.in
@@ -19,8 +19,30 @@
 
 <define name="config_path" value="${CMAKE_INSTALL_PREFIX}/config"/>
 
-
-<include name="[config_path]/WaveguideGeometry.xml"/>
+<geometry>
+
+	<!-- waveguide -->
+
+    <tag name="locust_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>
+</geometry>
+
+<include name="[config_path]/WaveguideGeometry_VTinyCoil.xml"/>
 
 
 <kassiopeia>
@@ -127,7 +149,7 @@
 
     <ksgen_generator_composite name="gen_uniform" pid="11">
         <energy_composite>
-            <energy_fix value="30427."/>
+            <energy_fix value="18600."/>
         </energy_composite>
         <position_rectangular_composite space="world/project8">
             <x_uniform value_min="0." value_max="0.0"/>
@@ -330,10 +352,10 @@
     <ksnav_surface name="nav_surface" transmission_split="true" reflection_split="false"/>
 
     <!-- terminators -->
-    <ksterm_max_time name="term_max_time" time="1.0e-6"/>
+    <ksterm_max_time name="term_max_time" time="1.0e-4"/>
     <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."/>
+    <ksterm_min_energy name="term_min_energy" energy="18000."/>
+    <ksterm_max_energy name="term_max_energy" energy="19000."/>
     <ksterm_min_z name="term_min_z" z="-.07"/>
     <ksterm_max_z name="term_max_z" z=".07"/>
     <ksterm_death name="term_upstream_endcap_death"/>
@@ -425,7 +447,6 @@
             <command parent="root_terminator" field="add_terminator" child="term_waveguide_jacket_death"/>
         </geo_surface>
 
-
         <command parent="root_terminator" field="add_terminator" child="term_min_energy"/> 
 <!--        <command parent="root_terminator" field="add_terminator" child="term_max_energy"/> -->
 
@@ -456,7 +477,7 @@
         name="project8_simulation"
         run="1"
         seed="[seed]"
-        events="3"
+        events="1"
         magnetic_field="total_magnetic_field"
         space="space_world"
         generator="[generator]"

diff --git a/Config/LocustMagDipoleAntennaTemplate.json.in b/Config/LocustMagDipoleAntennaTemplate.json.in
diff --git a/Config/LocustWaveguideTemplate.json.in b/Config/LocustWaveguideTemplate.json.in
@@ -1,50 +1,47 @@
 {
     "generators":
     [          
-       "kass-signal",
+       "cavity-signal",
        "lpf-fft",
-       "decimate-signal", 
-       "gaussian-noise",
+       "decimate-signal",
        "digitizer"
     ],
-
-    "lpf-fft":
-    {
-
-    },
-
-    "decimate-signal":
-    {
-
-    },
 
-    "kass-signal":
+    "cavity-signal":
     {
-        "lo-frequency": 25.3106e9,
-	"event-spacing-samples": 15000,
-	"center-to-short": 0.0488,
-        "center-to-antenna": 0.045,
-        "pitchangle-filename": "${CMAKE_INSTALL_PREFIX}/bin/pitchangles.txt",
+        "rectangular-waveguide": true,        
+        "transmitter": "kass-current",
+        "waveguide-x": 0.010668,
+        "waveguide-y": 0.004318,
+        "center-to-short": 0.05,
+        "center-to-antenna": 0.05,  
+        "waveguide-central-frequency": 1.63e11,
+        "back-reaction": "true",
+        "event-spacing-samples": 10,
+        "voltage-check": "false",
+        "lo-frequency": 25.9602e9,
         "xml-filename": "${CMAKE_INSTALL_PREFIX}/config/LocustKass_Waveguide_Template.xml"
     },
 
     "simulation":
     {
         "egg-filename": "${CMAKE_INSTALL_PREFIX}/output/locust_mc.egg",
         "n-records": 1,
-        "record-size": 819200
+        "record-size": 81920,
+        "acquisition-rate": 301,
+        "n-channels": 1
     },
 
     "gaussian-noise":
     {
-    "noise-floor-psd": 2.0e-26,
-    "domain": "time"
+    	"noise-floor-psd": 2.76e-22,
+    	"domain": "time"
     },
 
     "digitizer":
     {
-    "v-range": 4.0e-7,
-    "v-offset": -2.0e-7
+        "v-range":  5.0e-7,
+        "v-offset": -2.5e-7
     }
 
 }