minor bug fixes, new options

-DEVICE -> IRF
-tZero estimation implemented
-fit-weighting appears in results

Author: dpscience

DQuickLTFit.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.5.1, 2018-03-17T12:32:15. -->
+<!-- Written by QtCreator 3.5.1, 2018-03-19T08:59:48. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

Fit/lifetimedecayfit.cpp

@@ -943,6 +943,10 @@ void LifeTimeDecayFitEngine::createResultString(PALSDataStructure *dataStructure
     const QString chiSquare("<nobr><b>&#935;<sup>2</sup>:</b></nobr>");
     const QString chiSquareVal("<nobr><b>" % QString::number(fitSet->getChiSquareAfterFit(), 'g', 4) % "</b> (" % QString::number(fitSet->getChiSquareOnStart(), 'g', 4) % " @ start)" % "</nobr>");
 
+    const QString fitWeighting("<nobr><b>Fit-Weighting:</b></nobr>");
+    const QString fitWeightingVal("<nobr><b>" % QString((!fitSet->getUsingYVariance()?QString("no weighting"):QString("variance"))) % "</b></nobr>");
+
+
     const QString iterations("<nobr><b>Iterations:</b></nobr>");
     QString iterationsVal = "";
 
@@ -961,7 +965,7 @@ void LifeTimeDecayFitEngine::createResultString(PALSDataStructure *dataStructure
     const QString channelResolutionVal("<nobr><b>" % QVariant(fitSet->getChannelResolution()).toString() % " </b>ps</nobr>");
 
     const QString backgroundCounts("<nobr>Background:</nobr>");
-    const QString backgroundCountsVal("<nobr><b>" % QVariant(fitSet->getBackgroundParamPtr()->getParameter()->getStartValue()).toString() % "</b></nobr>");
+    const QString backgroundCountsVal("<nobr><b>" % QString::number(fitSet->getBackgroundParamPtr()->getParameter()->getStartValue(), 'f', 4) % "</b></nobr>");
 
     const QString countsInRange("<nobr>Integral Counts in ROI:</nobr>");
     const QString countsInRangeVal("<nobr><b>" % QVariant(fitSet->getCountsInRange()).toString() % "</b></nobr>");
@@ -995,6 +999,7 @@ void LifeTimeDecayFitEngine::createResultString(PALSDataStructure *dataStructure
     /*finish code and time/date:*/resultString = resultString % startRow % startContent % fitFinishCode % finishContent % startContent % fitFinishCodeVal % finishContent % finishRow % lineBreak;
 
     /*chi-square:*/resultString = resultString % startRow % startContent % chiSquare % finishContent % startContent % chiSquareVal % finishContent % finishRow % lineBreak;
+    /*fit-weighting:*/resultString = resultString % startRow % startContent % fitWeighting % finishContent % startContent % fitWeightingVal % finishContent % finishRow % lineBreak;
 
     /*iterations:*/resultString = resultString % startRow % startContent % iterations % finishContent % startContent % iterationsVal % finishContent % finishRow % lineBreak;
 

TestData/TestData.dquicklt

@@ -796,7 +796,7 @@ void DFastLTFitDlg::runFit()
                 conflictText.append(", ");
         }
 
-        conflictText.append("<br><br><b>DEVICE:</b> ");
+        conflictText.append("<br><br><b>IRF:</b> ");
 
         for ( int i = 0 ; i <  deviceConflictList.size() ; ++ i)
         {
@@ -940,6 +940,7 @@ void DFastLTFitDlg::instantPreview()
 
      int inRangeCnt = 0;
      int integralCounts = 0;
+     int tZero = 0;
 
      for ( QPointF p : dataStructure->getDataSetPtr()->getLifeTimeData() )
      {
@@ -962,6 +963,7 @@ void DFastLTFitDlg::instantPreview()
                  countsInPeak = p.y();
                  peakChannel = p.x();
                  peakChannelIndex = channelCnt;
+                 tZero = peakChannel;
              }
 
              inRangeCnt ++;
@@ -970,6 +972,7 @@ void DFastLTFitDlg::instantPreview()
          channelCnt ++;
      }
 
+     tZero -= startChannel;
 
     ///Parameter initial conditions:
     double *params = new double[paramCnt]; //source->sample->gaussian->bkgrd
@@ -1087,7 +1090,7 @@ void DFastLTFitDlg::instantPreview()
     }
     else
     {
-        m_integralCountInROI->setText("Integral Cnts. ROI [" % QVariant(startChannel).toString() % ":" % QVariant(stopChannel).toString() % "]: <b>" % QVariant(integralCounts).toString() % "</b>");
+        m_integralCountInROI->setText("t<sub>0</sub>: <b>" % QVariant(tZero*channelResolution).toString() % "ps</b> Integral Cnts. ROI [" % QVariant(startChannel).toString() % ":" % QVariant(stopChannel).toString() % "]: <b>" % QVariant(integralCounts).toString() % "</b>");
         m_chiSquareLabel->setText("&#967;<sup>2</sup> ( @ start ): <b>" % QString::number(residuum, 'g', 3) % "</b>"); //chi-square
     }