Add so you can drag-n-drop a DRF CSV file (made by InterSpec) onto app and use it.

Also added writing uncertainties to DRF output CSV file, and reading them back in.

Author: wcjohns

InterSpec/DetectorEdit.h

@@ -220,6 +220,16 @@ class DetectorEdit : public Wt::WContainerWidget
   //   on deplandcies)
   static std::shared_ptr<DetectorPeakResponse> initARelEffDetector( const SpecUtils::DetectorType type, InterSpec *interspec );
 
+  
+  /** Checks if file at passed in path is a TSV/CSV file that contains
+   coefficients for the exp( c0 + c1*logx + c2*logx^2 + ...) equation.
+   If so, returns detector.  If not, returns nullptr.
+   
+   ToDo: Currently reads in most of the information exported in the CSV from MakeDrf tool, but maybe not all.
+   */
+  static std::shared_ptr<DetectorPeakResponse> parseRelEffCsvFile( const std::string filePath );
+  
+  
   //Callbacks for when detector is changed or modified
   void gadrasDetectorSelectCallback();
   void relEffDetectorSelectCallback();
@@ -259,23 +269,13 @@ class DetectorEdit : public Wt::WContainerWidget
   //a row is selected, so update det and charts
   void dbTableSelectionChanged();
 
+  
 protected:
   void setAcceptButtonEnabled( const bool enable );
 
   /** Called when user changes value in m_uploadedDetName; sets m_detector name. */
   void handleUserChangedUploadedDrfName();
 
-  /** Checks if file at passed in path is a TSV/CSV file that contains
-      coeffeicents for the exp( c0 + c1*logx + c2*logx^2 + ...) equation.
-      If so, returns detector.  If not, returns nullptr.
-   
-   ToDo: Currently reads in most of the information exported in the CSV from
-     MakeDrf tool, except the uncertainities - should add this in.  Also, need
-     to cleanup the GUI during loading of this one CSV that has all the info
-     (def not correct, should hide detector diameter and option to upload
-      Detector.dat).
-   */
-  static std::shared_ptr<DetectorPeakResponse> checkIfFileIsRelEff( const std::string tsvfilepath );
 
 protected:
   WContainerWidget *m_footer;

src/DetectorEdit.cpp

@@ -2663,7 +2663,7 @@ void DetectorEdit::updateChart()
 } //DetectorEdit::updateChart()
 
 
-std::shared_ptr<DetectorPeakResponse> DetectorEdit::checkIfFileIsRelEff( const std::string filename )
+std::shared_ptr<DetectorPeakResponse> DetectorEdit::parseRelEffCsvFile( const std::string filename )
 {
 #ifdef _WIN32
   const std::wstring wfilename = SpecUtils::convert_from_utf8_to_utf16(filename);
@@ -2716,7 +2716,7 @@ std::shared_ptr<DetectorPeakResponse> DetectorEdit::checkIfFileIsRelEff( const s
 
     try
     {
-      vector<float> coefs( 8, 0.0f );
+      vector<float> coefs( 8, 0.0f ), coef_uncerts;
       for( int i = 0; i < 8; ++i )
       {
         string field = fields.at(3+i);
@@ -2740,9 +2740,36 @@ std::shared_ptr<DetectorPeakResponse> DetectorEdit::checkIfFileIsRelEff( const s
       const string name = (fields[0].empty() ? drfname : fields[0]);
       const float energUnits = ((foundKeV && !foundMeV) ? 1.0f : 1000.0f);
       float lowerEnergy = 0.0f, upperEnergy = 0.0f;
+      
+      // Lets try to get coefs uncertainties
+      if( !SpecUtils::safe_get_line(csvfile, line, 2048) )
+      {
+        try
+        {
+          vector<string> uncert_strs;
+          split_escaped_csv( uncert_strs, line );
+          if( !uncert_strs.empty()
+             && SpecUtils::istarts_with(uncert_strs[0], "# 1 sigma Uncert")
+             && (uncert_strs.size() >= (3 + coefs.size())) )
+          {
+            coef_uncerts.resize( coefs.size(), 0.0f );
+            for( int i = 0; i < coefs.size(); ++i )
+            {
+              string field = uncert_strs.at(3+i);
+              coef_uncerts[i] = (field.empty() ? 0.0f : std::stof(field));
+            }
+          }//if( it looks like we found the uncertainty line )
+        }catch( std::exception &e )
+        {
+          cerr << "Error caught parsing DRF eff uncertainties: " << e.what() << endl;
+          coef_uncerts.clear();
+        }
+      }//if( we got another line we'll check if its the uncertainties )
+      
+      
       auto det = std::make_shared<DetectorPeakResponse>( fields[0], drfdescrip );
 
-      det->fromExpOfLogPowerSeriesAbsEff( coefs, {}, dist, 2.0f*radius, energUnits,
+      det->fromExpOfLogPowerSeriesAbsEff( coefs, coef_uncerts, dist, 2.0f*radius, energUnits,
                                           lowerEnergy, upperEnergy );
 
       //Look for the line that gives the appropriate energy range.
@@ -2801,7 +2828,7 @@ std::shared_ptr<DetectorPeakResponse> DetectorEdit::checkIfFileIsRelEff( const s
   }//while( more lines )
 
   return nullptr;
-}//checkIfFileIsRelEff(...)
+}//parseRelEffCsvFile(...)
 
 
 
@@ -2855,7 +2882,7 @@ void DetectorEdit::fileUploadedCallback( const UploadCallbackReason context )
       if( !m_efficiencyCsvUpload->empty() )
       {
         const string filename = m_efficiencyCsvUpload->spoolFileName();
-        auto det = DetectorEdit::checkIfFileIsRelEff( filename );
+        auto det = DetectorEdit::parseRelEffCsvFile( filename );
 
         if( det )
         {

src/MakeDrf.cpp

@@ -2864,11 +2864,20 @@ void MakeDrf::writeCsvSummary( std::ostream &out,
     out << "," << ( (i==0 ? log(solidAngleAt25cm) : 0.0) + effEqnCoefs[i]);  //todo: make sure its not
   for( size_t i = effEqnCoefs.size(); i < 12; ++i )
     out << ",";
-  out << "25," << (0.5*diam/PhysicalUnits::cm) << "," << solidAngleAt25cm << endline
-  << endline
-  << endline;
+  out << "25," << (0.5*diam/PhysicalUnits::cm) << "," << solidAngleAt25cm << endline;
+  out << "# 1 sigma Uncertainties,";
+  if( releffuncert >= 0.0 )
+    out << 100*(releffuncert / NaI3x3IntrinsicEff) << "%";
+  out << ",";
+  for( size_t i = 0; i < effEqnCoefsUncerts.size(); ++i )
+    out << "," << effEqnCoefsUncerts[i];
+  if( effChi2 > 0 )
+    out << endline << "# Chi2 / DOF = " << effChi2 << " / " << (effDof-1)
+        << " = " << (effDof >= 1 ? (effChi2/(effDof-1.0)) : 0.0);
+  out << endline << endline;
+  
 
-  //Then need to give FWHM equation form and coefficienct, if avaialble.
+  //Then need to give FWHM equation form and coefficient, if available.
   if( fwhmCoefs.size() )
   {
     out << "# Full width half maximum (FWHM) follows equation: ";

src/SpecMeasManager.cpp

@@ -108,6 +108,7 @@
 #include "InterSpec/HelpSystem.h"
 #include "SpecUtils/Filesystem.h"
 #include "SpecUtils/StringAlgo.h"
+#include "InterSpec/DetectorEdit.h"
 #include "InterSpec/SimpleDialog.h"
 #include "InterSpec/InterSpecApp.h"
 #include "InterSpec/DataBaseUtils.h"
@@ -1273,35 +1274,16 @@ bool SpecMeasManager::handleNonSpectrumFile( const std::string &displayName,
     return (pos != char_end);
   };//header_contains lambda
 
-#define USE_SIMPLE_DIALOG_FOR_NOT_SPEC 1
 
-#if( USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
   SimpleDialog *dialog = new SimpleDialog();
-  dialog->addButton( "Close" );
+  WPushButton *closeButton = dialog->addButton( "Close" );
   WGridLayout *stretcher = new WGridLayout();
   stretcher->setContentsMargins( 0, 0, 0, 0 );
   dialog->contents()->setLayout( stretcher );
   WText *title = new WText( "Not a spectrum file" );
   title->addStyleClass( "title" );
   stretcher->addWidget( title, 0, 0 );
 
-#else
-  
-  AuxWindow *w = new AuxWindow( "Not a spectrum file",
-                (Wt::WFlags<AuxWindowProperties>(AuxWindowProperties::IsModal)
-                 | AuxWindowProperties::TabletNotFullScreen
-                 | AuxWindowProperties::SetCloseable
-                 | AuxWindowProperties::DisableCollapse) );
-  w->centerWindow();
-  w->rejectWhenEscapePressed( true );
-  WPushButton *b = w->addCloseButtonToFooter();
-  b->clicked().connect( w, &AuxWindow::hide );
-  w->finished().connect( boost::bind( &AuxWindow::deleteAuxWindow, w ) );
-  WGridLayout *stretcher = w->stretcher();
-  if( !m_viewer->isMobile() && m_viewer->renderedWidth() > 400 && m_viewer->renderedHeight() > 250 )
-    w->resize( 400, 250 );
-#endif
-  
   // const string filename = SpecUtils::filename(displayName);
 
   //Check if ICD2 file
@@ -1322,11 +1304,8 @@ bool SpecMeasManager::handleNonSpectrumFile( const std::string &displayName,
                             "If you believe this to be a legitimate spectrum file, please email it to <a href=\"mailto:interspec@sandia.gov\" target=\"_blank\">interspec@sandia.gov</a> to support this file type." );
       stretcher->addWidget( t, stretcher->rowCount(), 0, AlignCenter | AlignMiddle );
       t->setTextAlignment( Wt::AlignCenter );
-#if( USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
       dialog->show();
-#else
-      w->show();
-#endif
+      
       return true;
     }
   }//if( might be ICD2 )
@@ -1396,9 +1375,6 @@ bool SpecMeasManager::handleNonSpectrumFile( const std::string &displayName,
     WText *t = new WText( msg );
     stretcher->addWidget( t, stretcher->rowCount(), 0, AlignCenter | AlignMiddle );
     t->setTextAlignment( Wt::AlignCenter );
-#if( !USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
-    w->show();
-#endif
 
     return true;
   }//if( iszip )
@@ -1413,9 +1389,6 @@ bool SpecMeasManager::handleNonSpectrumFile( const std::string &displayName,
     WText *t = new WText( msg );
     stretcher->addWidget( t, stretcher->rowCount(), 0, AlignCenter | AlignMiddle );
     t->setTextAlignment( Wt::AlignCenter );
-#if( !USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
-    w->show();
-#endif
 
     return true;
   }//if( israr || istar || iszip7 || isgz )
@@ -1427,9 +1400,6 @@ bool SpecMeasManager::handleNonSpectrumFile( const std::string &displayName,
     WText *t = new WText( msg );
     stretcher->addWidget( t, stretcher->rowCount(), 0, AlignCenter | AlignMiddle );
     t->setTextAlignment( Wt::AlignCenter );
-#if( !USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
-    w->show();
-#endif
 
     return true;
   }//if( ispdf | isps | istif )
@@ -1458,24 +1428,15 @@ bool SpecMeasManager::handleNonSpectrumFile( const std::string &displayName,
       vector<uint8_t> totaldata( filesize );
       const bool success = infile.read( (char *)&(totaldata[0]), filesize ).good();
 
-      if( !m_viewer->isMobile() )
-      {
-#if( !USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
-        w->resize( WLength::Auto, WLength::Auto );
-        w->setMaximumSize( 0.6*m_viewer->renderedWidth(), 0.8*m_viewer->renderedHeight() );
-#endif
-      }
 
       if( success )
       {
         resource->setData( totaldata );
         image->setImageLink( WLink(resource) );
-#if( USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
         const int ww = m_viewer->renderedWidth();
         const int wh = m_viewer->renderedHeight();
         if( (ww > 120) && (wh > 120) )
           image->setMaximumSize( WLength(0.45*ww,WLength::Unit::Pixel), WLength(wh - 120, WLength::Unit::Pixel) );
-#endif
         stretcher->addWidget( image.release(), stretcher->rowCount(), 0, AlignCenter | AlignMiddle );
       }else
       {
@@ -1489,13 +1450,7 @@ bool SpecMeasManager::handleNonSpectrumFile( const std::string &displayName,
       errort->setTextAlignment( Wt::AlignCenter );
       stretcher->addWidget( errort, stretcher->rowCount(), 0, AlignCenter | AlignMiddle );
     }//if( filesize < max_disp_size ) / else
-    
-#if( !USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
-    w->show();
-    w->resizeToFitOnScreen();
-    w->centerWindowHeavyHanded();
-#endif
-    
+        
     return true;
   }//if( isgif || isjpg || ispng || isbmp )
 
@@ -1520,11 +1475,8 @@ bool SpecMeasManager::handleNonSpectrumFile( const std::string &displayName,
                   orig_peaks, PeakSearchGuiUtils::PeakTemplateFitSrc::CsvFile, seessionid );
       } ) );
 
-#if( USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
       delete dialog;
-#else
-      delete w;
-#endif
+
       return true;
     }catch( exception &e )
     {
@@ -1537,38 +1489,55 @@ bool SpecMeasManager::handleNonSpectrumFile( const std::string &displayName,
       errort->setTextAlignment( Wt::AlignCenter );
       stretcher->addWidget( errort, stretcher->rowCount(), 0, AlignCenter | AlignMiddle );
 
-#if( !USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
-      w->show();
-      w->resizeToFitOnScreen();
-      w->centerWindowHeavyHanded();
-#endif
-      
       return true;
     }//try / catch get candidate peaks )
   }//if( we could possible care about propagating peaks from a CSV file )
 
 
-  /*
   // Check if this is an InterSpec exported DRF CSV
   if( header_contains( "# Detector Response Function" ) )
   {
-    auto det = DetectorEdit::checkIfFileIsRelEff( fileLocation );
+    shared_ptr<DetectorPeakResponse> det = DetectorEdit::parseRelEffCsvFile( fileLocation );
 
-    if( det )
+    if( det && det->isValid() )
     {
-      // Generate a eff plot, and basic info, and display.
-      // Then ask user if they want to use DRF; if so save to `InterSpec::writableDataDirectory() + "UploadedDrfs"`
+      // TODO: generate a eff plot, and basic info, and display; probably by refactoring DetectorEdit::updateChart()
+      // TODO: Ask user if they want to use DRF; if so save to `InterSpec::writableDataDirectory() + "UploadedDrfs"`
+      // TODO: handle CSV/TSV files that have multiple DRFs
+      // TODO: handle GADRAS style Efficiency.csv files
+      // TODO: allow users to rename the DRF.
 
-#if( USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
-      delete dialog;
-#else
-      delete w;
-#endif
+      const string name = Wt::Utils::htmlEncode( det->name() );
+      
+      string msg = "<p style=\"white-space: nowrap;\">"
+        "This file looks to be a Detector Response Function."
+      "</p>"
+      "<p style=\"text-align: left; white-space: nowrap;\">"
+      "Name: " + name +
+      "</p>"
+      "<p>Would you like to use this DRF?</p>"
+      ;
+      
+      WText *t = new WText( WString::fromUTF8(msg) );
+      stretcher->addWidget( t, stretcher->rowCount(), 0, AlignCenter | AlignMiddle );
+      t->setTextAlignment( Wt::AlignCenter );
+
+      dialog->addButton( "No" ); //no further action necessary if user clicks no; dialog will close
+      closeButton->setText( "Yes" );
+      closeButton->clicked().connect( std::bind( [det](){
+        InterSpec *interspec = InterSpec::instance();
+        if( interspec )
+        {
+          auto sql = interspec->sql();
+          auto user = interspec->m_user;
+          DetectorEdit::updateLastUsedTimeOrAddToDb( det, user.id(), sql );
+          interspec->detectorChanged().emit( det ); //This loads it to the foreground spectrum file
+        }
+      } ) );
 
       return true;
     }
   }//if( maybe a drf )
-  */
 
 
   /*
@@ -1600,12 +1569,7 @@ bool SpecMeasManager::handleNonSpectrumFile( const std::string &displayName,
   }//if( header_contains( "Relative Eff" ) && header_contains( "#credit" ) )
    */
 
-  
-#if( USE_SIMPLE_DIALOG_FOR_NOT_SPEC )
   delete dialog;
-#else
-  delete w;
-#endif
 
   return false;
 }//void handleNonSpectrumFile(...)