Add a few more CSV-based detector efficiency file formats that can be read in.

Also, added the Efficeincy CSV files being able to be drag-n-dropped onto the app - to then create a dialog to finish inputting the relevant info.

Author: wcjohns

InterSpec/DetectorPeakResponse.h

@@ -239,6 +239,11 @@ class DetectorPeakResponse
 
     /** From ANGLE .outx file. */
     AngleOutx = 11,
+
+    /** From a drag-and-dropped efficiency CSV file (gamEff, Run_effoutput, or standalone
+     GADRAS Efficiency.csv).
+     */
+    UserImportedEfficiencyCsvDrf = 12,
   };//enum DrfSource
 
 public:
@@ -522,6 +527,44 @@ class DetectorPeakResponse
    */
   static std::shared_ptr<DetectorPeakResponse> parseAngleOutxFile( std::istream &input );
 
+  /** Result struct from parsing an efficiency CSV file. */
+  struct EffCsvParseResult
+  {
+    std::shared_ptr<DetectorPeakResponse> drf;
+
+    /** Whether the detected format was a GADRAS Efficiency.csv (has "(%" on line 2).
+     If true, the dialog should offer optional Detector.dat upload for diameter/setback.
+     */
+    bool is_gadras_format;
+  };//struct EffCsvParseResult
+
+  /** Parses a CSV file containing energy-efficiency pairs.
+
+   Auto-detects three formats:
+   - GADRAS Efficiency.csv: Has "(%" on second line. Efficiency in column 2 as percentage.
+   - gamEff CSV: Header has "efficiency" (case-insensitive). 2-column fractional (0-1).
+   - Run_effoutput CSV: Multi-column with "Eff" column header. Fractional efficiency.
+
+   Returns the DRF with FixedGeomTotalAct geometry and kEnergyEfficiencyPairs form
+   (caller should reinterpret geometry via dialog).
+
+   Throws std::runtime_error if the file cannot be parsed as any supported format.
+   */
+  static EffCsvParseResult parseEfficiencyCsvFile( std::istream &input );
+
+  /** Parses a GADRAS Detector.dat file to extract detector diameter and setback.
+
+   Handles both legacy text and newer XML Detector.dat formats.
+
+   @param detDatFile Input stream for the Detector.dat file.
+   @param[out] diameter Detector diameter in PhysicalUnits.
+   @param[out] setback Detector setback in PhysicalUnits, or 0 if not found.
+
+   Throws std::runtime_error if the file cannot be parsed.
+   */
+  static void parseDetectorDatGeometry( std::istream &detDatFile,
+                                        float &diameter, float &setback );
+
   /** Converts between the fixed geometry types of EffGeometryType.
    
    @param quantity Either the surface area or mass (in units of PhysicalUnits), depending on value to `to_type`.

InterSpec/SpecMeasManager.h

@@ -237,7 +237,12 @@ class SpecMeasManager : public Wt::WObject
 
   /** Handles the user dropping a .ECC file from ISOCS, or a .outx file from ANGLE. */
   bool handleEccFile( std::istream &input, SimpleDialog *dialog );
-  
+
+  /** Handles the user dropping an efficiency CSV file (GADRAS Efficiency.csv,
+   gamEff CSV, or Run_effoutput CSV).
+   */
+  bool handleEfficiencyCsvFile( std::istream &input, SimpleDialog *dialog );
+
   /** Some input files contain duplicate data - we will ask the user how they want to handle
    this, first handling "Derived Data", then "Multiple Energy Calibration Types", then
    "Multiple Virtual Detectors"

InterSpec_resources/app_text/SpecMeasManager.xml

@@ -142,6 +142,13 @@
   <message id="smm-outx-curve">ANGLE Efficiency Calibration Curve DRF</message>
   <message id="smm-outx-error">Error creating DRF from ANGLE .outx: {1}</message>
 
+  <!-- Text for dialog when user drag-n-drop an efficiency CSV file onto app -->
+  <message id="smm-eff-csv-curve">Efficiency CSV Curve DRF</message>
+  <message id="smm-eff-csv-error">Error creating DRF from efficiency CSV: {1}</message>
+  <message id="smm-eff-csv-det-dat-label">Detector.dat (optional)</message>
+  <message id="smm-eff-csv-intrinsic">Intrinsic Efficiency</message>
+  <message id="smm-eff-csv-abs-eff">Absolute Efficiency</message>
+
   <!-- Text for dialog when user drag-n-drop the Activity/Shielding fit file onto app -->
   <message id="smm-act-shield-xml">Activity/Shielding XML</message>
   <message id="smm-act-shield-use">Use this Activity/Shielding fit setup?</message>

InterSpec_resources/static_text/faqs/faqs.xml

@@ -1218,7 +1218,13 @@
       <ul>
         <li>DRFs created using the &quot;Make Detector Response&quot;, in <code>CSV</code>, <code>XML</code>, <code>URI</code>, or <code>QR-code</code> form</li>
         <li>From <a target="_blank" href="https://rsicc.ornl.gov/PackageDetail.aspx?p=GADRAS-DRF-18.8.13&amp;id=P00610&amp;cpu=PCX86&amp;v=04&amp;t=Gamma%20Detector%20Response%20and%20Analysis%20Software–Detector%20Response%20Function.">GADRAS-DRF</a></li>
-        <li>In a couple <code>CSV</code>/<code>TSV</code> formats</li>
+        <li>In a couple <code>CSV</code>/<code>TSV</code> formats
+          <ul>
+            <li>Files with a variant of at least &quot;Energy&quot; and &quot;Efficiency&quot; header column</li>
+            <li>See <code>data/common_drfs.tsv</code> for a format that holds multiple detectors</li>
+          </ul>
+        </li>
+        <li><code>.outx</code> files produced by <a target="_blank" href="https://www.angle.me">Angle</a></li>
         <li><code>.ECC</code> files produced by
           <a target="_blank" href="https://www.mirion.com/products/technologies/spectroscopy-scientific-analysis/gamma-spectroscopy/gamma-spectroscopy-software/lab-applications/s573-isocs-calibration-software">Mirion ISOCS</a>
         </li>