Merge remote-tracking branch 'origin/develop'

project8 · Mar 5, 2023 · 5752ae0 · 5752ae0
2 parents 04954c5 + 2f4b105
commit 5752ae0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Config/LocustKass_Cavity_1GHz.xml.in b/Config/LocustKass_Cavity_1GHz.xml.in
@@ -340,6 +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"/>
 
 
     <!-- modifiers -->
@@ -421,6 +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_min_energy"/> 

diff --git a/Config/LocustKass_Cavity_CCA.xml.in b/Config/LocustKass_Cavity_CCA.xml.in
@@ -340,8 +340,9 @@
     <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"/>
 
-
+        
     <!-- modifiers -->
     <cycl_rad_extr name="rad_extr" P8Phase="4" /> 
     <mod_run_pause name="run_pause"/>
@@ -421,6 +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_min_energy"/> 

diff --git a/Source/Utilities/LMCCavityUtility.cc b/Source/Utilities/LMCCavityUtility.cc
@@ -139,12 +139,13 @@ namespace locust
                 if (convolutionMag*convolutionMag > maxGain)
                 {
                 	maxGain = convolutionMag*convolutionMag;
+                	qInferred = 0.;
                 }
                 else if ((convolutionMag*convolutionMag < 0.5*maxGain) && (qInferred == 0.))
                 {
                 	qInferred = dhoCavityFrequency /  (2.* rfStepSize * (rfStep-1));
                 }
-    			LPROG( testlog, "Cavity GF gain at frequency " << fRF_frequency << " is " << convolutionMag );
+                LPROG( testlog, "Cavity GF gain at frequency " << fRF_frequency << " is " << convolutionMag );
             } // rfStep
 
         delete aSignal;