Merge remote-tracking branch 'origin/develop'

project8 · Apr 26, 2023 · 52a8690 · 52a8690
2 parents 171a4ef + 06ce310
commit 52a8690
Show file tree

Hide file tree

Showing 36 changed files with 1,547 additions and 913 deletions.
diff --git a/CMakeLists.txt b/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 2.2.0)
+project( locust_mc VERSION 2.3.3)
 
 
 list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Scarab/cmake )

diff --git a/Config/LocustCavity1GHz.json.in b/Config/LocustCavity1GHz.json.in
@@ -28,7 +28,7 @@
         "egg-filename": "${CMAKE_INSTALL_PREFIX}/output/locust_mc.egg",
         "n-records": 1,
         "record-size": 81920,
-        "acquisition-rate": 21,
+        "acquisition-rate": 22,
         "n-channels": 1
     },
 
@@ -40,8 +40,8 @@
 
     "digitizer":
     {
-        "v-range":  5.0e-07,
-        "v-offset": -2.5e-07
+        "v-range":  2.0e-6,
+        "v-offset": -1.0e-6
     }
 
 }

diff --git a/Config/LocustCavityCCA.json.in b/Config/LocustCavityCCA.json.in
@@ -14,7 +14,7 @@
         "cavity-length": 0.1,           
         "back-reaction": "true",
         "dho-cavity-frequency": 25.9e9,
-        "dho-time-resolution": 1.0e-10,
+        "dho-time-resolution": 9.0e-11,
         "dho-threshold-factor": 0.01,
         "event-spacing-samples": 10,
         "e-gun": false,        
@@ -28,7 +28,7 @@
         "egg-filename": "${CMAKE_INSTALL_PREFIX}/output/locust_mc.egg",
         "n-records": 1,
         "record-size": 81920,
-        "acquisition-rate": 205,
+        "acquisition-rate": 301,
         "n-channels": 1
     },
 
@@ -40,8 +40,8 @@
 
     "digitizer":
     {
-        "v-range":  100.0,
-        "v-offset": -50.0
+        "v-range":  0.08,
+        "v-offset": -0.04
     }
 
 }

diff --git a/Config/LocustKass_Cavity_1GHz.xml.in b/Config/LocustKass_Cavity_1GHz.xml.in
@@ -340,7 +340,7 @@
     <ksterm_max_energy name="term_max_energy" energy="30430."/>
     <ksterm_min_z name="term_min_z" z="-4.0"/>
     <ksterm_max_z name="term_max_z" z="4.0"/>
-    <ksterm_max_r name="term_max_r" r="0.18"/>
+    <ksterm_max_r name="term_max_rlocust" r="1000."/>
 
 
     <!-- modifiers -->
@@ -422,7 +422,7 @@
         <command parent="root_terminator" field="add_terminator" child="term_max_z"/>
         <command parent="root_terminator" field="add_terminator" child="term_min_z"/>
 
-        <command parent="root_terminator" field="add_terminator" child="term_max_r"/>
+        <command parent="root_terminator" field="add_terminator" child="term_max_rlocust"/>
 
 
         <command parent="root_terminator" field="add_terminator" child="term_min_energy"/> 

diff --git a/Config/LocustKass_Cavity_CCA.xml.in b/Config/LocustKass_Cavity_CCA.xml.in
@@ -340,7 +340,7 @@
     <ksterm_max_energy name="term_max_energy" energy="30430."/>
     <ksterm_min_z name="term_min_z" z="-4.0"/>
     <ksterm_max_z name="term_max_z" z="4.0"/>
-    <ksterm_max_r name="term_max_r" r="0.007"/>
+    <ksterm_max_r name="term_max_rlocust" r="1000."/>
 
 
     <!-- modifiers -->
@@ -422,7 +422,7 @@
         <command parent="root_terminator" field="add_terminator" child="term_max_z"/>
         <command parent="root_terminator" field="add_terminator" child="term_min_z"/>
 
-        <command parent="root_terminator" field="add_terminator" child="term_max_r"/>
+        <command parent="root_terminator" field="add_terminator" child="term_max_rlocust"/>
 
 
         <command parent="root_terminator" field="add_terminator" child="term_min_energy"/> 

diff --git a/Source/Applications/Testing/testLMCCavity.cc b/Source/Applications/Testing/testLMCCavity.cc
@@ -67,12 +67,16 @@ class testCavity_app : public main_app
 			fDHOTimeResolution(1.e-8),
 			fDHOThresholdFactor(0.01),
 			fCavityFrequency(1.067e9),
-			fCavityQ(1000.)
+			fCavityQ(1000.),
+			fExpandSweep(1.0),
+			fUnitTestOutputFile(false)
         {
             add_option("-r,--dho-time-resolution", fDHOTimeResolution, "[1.e-8] Time resolution used in Green's function (s).");
             add_option("-m,--dho-threshold-factor", fDHOThresholdFactor, "[0.01] Minimum fractional threshold of Green's function used to calculate FIR.");
             add_option("-f,--dho-cavity-frequency", fCavityFrequency, "[1.067e9] Cavity resonant frequency (Hz).");
             add_option("-q,--dho-cavity-Q", fCavityQ, "[1000] Cavity Q.");
+            add_option("-x,--expand-sweep", fExpandSweep, "[1.0] Factor by which to expand range of frequency sweep.");
+            add_option("-w, --write-output", fUnitTestOutputFile, "[0==false] Write histo to Root file.");
         }
 
         virtual ~testCavity_app() {}
@@ -93,13 +97,23 @@ class testCavity_app : public main_app
         {
         	return fCavityQ;
         }
+        double GetExpandSweep()
+        {
+        	return fExpandSweep;
+        }
+        bool UnitTestOutputFile()
+        {
+        	return fUnitTestOutputFile;
+        }
 
 
     private:
         double fDHOTimeResolution;
         double fDHOThresholdFactor;
         double fCavityFrequency;
         double fCavityQ;
+        double fExpandSweep;
+        bool fUnitTestOutputFile;
 };
 
 
@@ -118,7 +132,9 @@ TEST_CASE( "testLMCCavity with default parameter values (pass)", "[single-file]"
 
 	CavityUtility aCavityUtility;
 
-    bool checkCavityQ = aCavityUtility.CheckCavityQ( the_main.GetDHOTimeResolution(), the_main.GetDHOThresholdFactor(), the_main.GetCavityFrequency(), the_main.GetCavityQ() );
+	aCavityUtility.SetExpandFactor(the_main.GetExpandSweep());
+	aCavityUtility.SetOutputFile(the_main.UnitTestOutputFile());
+	bool checkCavityQ = aCavityUtility.CheckCavityQ( the_main.GetDHOTimeResolution(), the_main.GetDHOThresholdFactor(), the_main.GetCavityFrequency(), the_main.GetCavityQ() );
 
 	REQUIRE( checkCavityQ );
 }

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -183,8 +183,9 @@ if (locust_mc_BUILD_WITH_KASSIOPEIA)
 
         Fields/LMCField.hh
         Fields/LMCCylindricalCavity.hh
+        Fields/LMCPozarCylindricalCavity.hh
         Fields/LMCRectangularWaveguide.hh
-        Fields/LMCHFSSFieldMap.hh
+        Fields/LMCPozarRectangularWaveguide.hh
     )
 
     set( LOCUST_MC_SOURCE_FILES ${LOCUST_MC_SOURCE_FILES}
@@ -216,8 +217,9 @@ if (locust_mc_BUILD_WITH_KASSIOPEIA)
 
         Fields/LMCField.cc
         Fields/LMCCylindricalCavity.cc
+        Fields/LMCPozarCylindricalCavity.cc
         Fields/LMCRectangularWaveguide.cc
-        Fields/LMCHFSSFieldMap.cc
+        Fields/LMCPozarRectangularWaveguide.cc
     )
 endif (locust_mc_BUILD_WITH_KASSIOPEIA)