Fix templating sometimes not working for trace sources.

sandialabs · Sep 10, 2024 · 946af22 · 946af22
1 parent ba5b9d5
commit 946af22
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/InterSpec_resources/static_text/ShieldSourceFitLog/act_fit.tmplt.html b/InterSpec_resources/static_text/ShieldSourceFitLog/act_fit.tmplt.html
@@ -461,11 +461,14 @@ <h1 class="title">
 {% if shield.IsGeneric %}
     Generic AN={{ shield.AN }}, AD={{ shield.AD }} g/cm3:
 {% else %}
-    {{ shield.Name }}{% if existsIn(shield,"Formula") %}, {{ shield.Formula }},{% endif %} density={{ shield.Density }} g/cm3, {{ Shieldings.Geometry }}: [{% for dimNum in range(Shieldings.NumDimensions) %}{% if dimNum > 1 %}, {% endif %}{{ at(Shieldings.DimensionMeanings,dimNum) }}_thickness={{at(shield.Thicknesses,dimNum)}}{% endfor %}]
+    {{ shield.Name }}{% if existsIn(shield,"Formula") %}, {{ shield.Formula }},{% endif %} density={{ shield.Density_gPerCm3 }} g/cm3, {{ Shieldings.Geometry }}: [{% for dimNum in range(Shieldings.NumDimensions) %}{% if dimNum > 1 %}, {% endif %}{{ at(Shieldings.DimensionMeanings,dimNum) }}_thickness={{at(shield.Thicknesses,dimNum)}}{% endfor %}]
 {% endif %}
 {% if exists("PeaksUsedForActivityFitting") %}
 ## for peak in PeaksUsedForActivityFitting.Peaks
-        {% if (shield.ShieldingNumber < length(peak.ShieldAttenuations)) and (at(peak.ShieldAttenuations,shield.ShieldingNumber) > 0.0) %}For peak at {{ peak.Energy}} keV, attenuation multiple of {{ at(peak.ShieldAttenuations,shield.ShieldingNumber) }}{% endif %}
+        {% if (shield.ShieldingNumber < length(peak.ShieldAttenuations)) %}{% 
+          if (at(peak.ShieldAttenuations,shield.ShieldingNumber) > 0.0) 
+          %}For peak at {{ peak.Energy}} keV, attenuation multiple of {{ at(peak.ShieldAttenuations,shield.ShieldingNumber) }}{% 
+            endif %}{% endif %}
 
 ##endfor
 {% endif %}
@@ -485,7 +488,7 @@ <h1 class="title">
 {% if shield.IsGeneric %}
     Generic shielding AN={{ shield.AN }}, AD={{ shield.AD }} g/cm3
 {% else %}
-    {{ shield.Name }} has density {{ shield.Density }} g/cm3 and dimensions {% for i in range(shield.NumDimensions) %} {{ at(Shieldings.DimensionMeanings,i) }}: {{ at(shield.Thicknesses, i) }}{% if at(shield.DimensionIsFit, i) %} (+-{{ at(shield.ThicknessesUncerts,i) }}) {% endif %} {% endfor %}
+    {{ shield.Name }} has density {{ shield.Density_gPerCm3 }} g/cm3 and dimensions {% for i in range(shield.NumDimensions) %} {{ at(Shieldings.DimensionMeanings,i) }}: {{ at(shield.Thicknesses, i) }}{% if at(shield.DimensionIsFit, i) %} (+-{{ at(shield.ThicknessesUncerts,i) }}) {% endif %} {% endfor %}
 {% endif %}
 ##endfor
 {% else %}

diff --git a/InterSpec_resources/static_text/ShieldSourceFitLog/std_fit_log.tmplt.txt b/InterSpec_resources/static_text/ShieldSourceFitLog/std_fit_log.tmplt.txt
@@ -25,7 +25,10 @@ Shieldings:
 {% endif %}
 {% if exists("PeaksUsedForActivityFitting") %}
 ## for peak in PeaksUsedForActivityFitting.Peaks
-        {% if (shield.ShieldingNumber < length(peak.ShieldAttenuations)) and (at(peak.ShieldAttenuations,shield.ShieldingNumber) > 0.0) %}For peak at {{ peak.Energy}} keV, attenuation multiple of {{ at(peak.ShieldAttenuations,shield.ShieldingNumber) }}{% endif %}
+        {% if (shield.ShieldingNumber < length(peak.ShieldAttenuations)) %}{%
+            if (at(peak.ShieldAttenuations,shield.ShieldingNumber) > 0.0) 
+            %}For peak at {{ peak.Energy}} keV, attenuation multiple of {{ at(peak.ShieldAttenuations,shield.ShieldingNumber) }}{% 
+        endif %}{% endif %}
 
 ##endfor
 {% endif %}
@@ -62,7 +65,7 @@ Shieldings:
 {% if shield.IsGeneric %}
     Generic shielding AN={{ shield.AN }}, AD={{ shield.AD }} g/cm3
 {% else %}
-    {{ shield.Name }} has density {{ shield.Density }} g/cm3 and dimensions {% for i in range(shield.NumDimensions) %} {{ at(Shieldings.DimensionMeanings,i) }}: {{ at(shield.Thicknesses, i) }}{% if at(shield.DimensionIsFit, i) %} (+-{{ at(shield.ThicknessesUncerts,i) }}) {% endif %} {% endfor %}
+    {{ shield.Name }} has density {{ shield.Density_gPerCm3 }} g/cm3 and dimensions {% for i in range(shield.NumDimensions) %} {{ at(Shieldings.DimensionMeanings,i) }}: {{ at(shield.Thicknesses, i) }}{% if at(shield.DimensionIsFit, i) %} (+-{{ at(shield.ThicknessesUncerts,i) }}) {% endif %} {% endfor %}
 {% endif %}
 ##endfor
 {% else %}

diff --git a/src/BatchActivity.cpp b/src/BatchActivity.cpp
@@ -333,7 +333,7 @@ void add_basic_src_details( const GammaInteractionCalc::SourceDetails &src,
 
     src_json["TraceActivityPostFix"] = trace_src_postfix;
 
-    if( src.ageIsFit )
+    if( src.activityIsFit )
     {
       src_json["TraceDisplayActivityUncert"] = PhysicalUnits::printToBestActivityUnits(src.traceSrcDisplayActUncertainty,4,!useBq) + trace_src_postfix;
       src_json["TraceDisplayActivityUncert_bq"] = src.traceSrcDisplayActUncertainty / PhysicalUnits::bq;
@@ -1097,6 +1097,10 @@ void fit_activities_in_files( const std::string &exemplar_filename,
 
       cerr << msg << endl;
       throw;
+    }catch( std::exception &e )
+    {
+      cerr << "Error in 'printFixed': " << e.what() << endl;
+      throw;
     }
   };
 
@@ -1119,6 +1123,10 @@ void fit_activities_in_files( const std::string &exemplar_filename,
 
       cerr << msg << endl;
       throw;
+    }catch( std::exception &e )
+    {
+      cerr << "Error in 'printCompact': " << e.what() << endl;
+      throw;
     }
     return "";
   };

diff --git a/src/BatchCommandLine.cpp b/src/BatchCommandLine.cpp
@@ -330,7 +330,7 @@ int run_batch_command( int argc, char **argv )
         if( num_defaults )
           args.insert( end(args), begin(def_args), end(def_args) );
 
-        const auto want_none =  [](const string &v){ return SpecUtils::iequals_ascii(v, "none"); };
+        const auto want_none = [](const string &v){ return SpecUtils::iequals_ascii(v, "none"); };
         if( std::count_if( begin(args), end(args), want_none) )
           args.clear();
       };