Merge pull request #301 from project8/feature/rectangularCavity

Feature/rectangular cavity

Config/CMakeLists.txt

@@ -9,6 +9,7 @@ configure_file( LocustKass_Cavity_CCA.xml.in LocustKass_Cavity_CCA.xml )
 configure_file( LocustKass_Cavity_1GHz.xml.in LocustKass_Cavity_1GHz.xml )
 configure_file( LocustWaveguideTemplate.json.in LocustWaveguideTemplate.json )
 configure_file( LocustCavityCCA.json.in LocustCavityCCA.json )
+configure_file( LocustCavityRectangular.json.in LocustCavityRectangular.json )
 configure_file( LocustCavity1GHz.json.in LocustCavity1GHz.json )
 configure_file( LocustSignalPlusNoise.json.in LocustSignalPlusNoise.json )
 configure_file( LocustFreeSpaceTemplate.json.in LocustFreeSpaceTemplate.json )
@@ -34,6 +35,7 @@ set (EXAMPLE_CONFIGFILES
 	WaveguideGeometry_VTinyCoil.xml
     ${CMAKE_CURRENT_BINARY_DIR}/LocustWaveguideTemplate.json
     ${CMAKE_CURRENT_BINARY_DIR}/LocustCavityCCA.json
+    ${CMAKE_CURRENT_BINARY_DIR}/LocustCavityRectangular.json
     ${CMAKE_CURRENT_BINARY_DIR}/LocustCavity1GHz.json
     ${CMAKE_CURRENT_BINARY_DIR}/LocustFreeSpaceTemplate.json
     ${CMAKE_CURRENT_BINARY_DIR}/LocustPlaneWaveTemplate.json

Config/LocustCavityRectangular.json.in

@@ -0,0 +1,49 @@
+{
+    "generators":
+    [          
+       "cavity-signal",
+       "lpf-fft",
+       "decimate-signal",
+       "digitizer"
+    ],
+
+    "cavity-signal":
+    {        
+        "transmitter": "kass-current",
+        "rectangular-cavity": "true",
+        "cavity-x": 1.0,
+        "cavity-y": 0.007,
+        "cavity-length": 0.1,  
+        "back-reaction": "true",
+        "dho-cavity-frequency": 25.9e9,
+        "dho-time-resolution": 9.0e-11,
+        "dho-threshold-factor": 0.01,
+        "event-spacing-samples": 10,
+        "voltage-check": "false",
+        "lo-frequency": 25.9602e9,
+        "xml-filename": "${CMAKE_INSTALL_PREFIX}/config/LocustKass_Cavity_CCA.xml"
+    },
+
+    "simulation":
+    {
+        "egg-filename": "${CMAKE_INSTALL_PREFIX}/output/locust_mc.egg",
+        "n-records": 1,
+        "record-size": 81920,
+        "acquisition-rate": 301,
+        "n-channels": 1
+    },
+
+    "gaussian-noise":
+    {
+    	"noise-floor-psd": 2.76e-22,
+    	"domain": "time"
+    },
+
+    "digitizer":
+    {
+        "v-range":  0.01,
+        "v-offset": -0.005
+    }
+
+}
+

Data/ModeMaps/CMakeLists.txt

@@ -1,7 +1,8 @@
 # CMakeLists.txt for Locust_mc/Data/ModeMaps
 
 set( LOCUST_MC_DATA_FILES      
-    PozarExportTE011.txt
+    PozarExport_Ex_RectangularTE011.txt
+    PozarExport_Etheta_CylindricalTE011.txt
 )
 
 pbuilder_install_data( ${LOCUST_MC_DATA_FILES} )