First successful compilation of AsymmetryBNMR

src/classes/CMakeLists.txt

@@ -65,6 +65,7 @@ add_library(PMusr SHARED
   PMusrT0Dict.cxx
   PPrepFourier.cpp
   PRunAsymmetry.cpp
+  PRunAsymmetryBNMR.cpp
   PRunAsymmetryRRF.cpp
   PRunBase.cpp
   PRunDataHandler.cpp

src/classes/Makefile.am

@@ -15,6 +15,7 @@ h_sources = \
   ../include/PMusrT0.h \
   ../include/PPrepFourier.h \
   ../include/PRunAsymmetry.h \
+  ../include/PRunAsymmetryBNMR.h \
   ../include/PRunAsymmetryRRF.h \
   ../include/PRunBase.h \
   ../include/PRunDataHandler.h \
@@ -61,6 +62,7 @@ cpp_sources = \
   PMusrT0.cpp \
   PPrepFourier.cpp \
   PRunAsymmetry.cpp \
+  PRunAsymmetryBNMR.cpp \
   PRunAsymmetryRRF.cpp \
   PRunBase.cpp \
   PRunDataHandler.cpp \

src/classes/PRunListCollection.cpp

@@ -1054,49 +1054,6 @@ PRunData* PRunListCollection::GetAsymmetryRRF(UInt_t index, EDataSwitch tag)
   return data;
 }
 
-//--------------------------------------------------------------------------
-// GetAsymmetryBNMR (public)
-//--------------------------------------------------------------------------
-/**
- * <p>Get a processed asymmetry BNMR data set.
- *
- * <b>return:</b>
- * - pointer to the run data set (processed data) if data set is found
- * - null pointer otherwise
- *
- * \param index msr-file run index
- * \param tag kIndex -> data at index, kRunNo -> data of given run no
- */
-PRunData* PRunListCollection::GetAsymmetryBNMR(UInt_t index, EDataSwitch tag)
-{
-  PRunData *data = 0;
-
-  switch (tag) {
-    case kIndex: // called from musrfit when dumping the data
-      if (index > fRunAsymmetryBNMRList.size()) {
-        cerr << endl << ">> PRunListCollection::GetAsymmetryBNMR(): **ERROR** index = " << index << " out of bounds";
-        cerr << endl;
-        return 0;
-      }
-
-      fRunAsymmetryBNMRList[index]->CalcTheory();
-      data = fRunAsymmetryBNMRList[index]->GetData();
-      break;
-    case kRunNo: // called from PMusrCanvas
-      for (UInt_t i=0; i<fRunAsymmetryBNMRList.size(); i++) {
-        if (fRunAsymmetryBNMRList[i]->GetRunNo() == index) {
-          data = fRunAsymmetryBNMRList[i]->GetData();
-          break;
-        }
-      }
-      break;
-    default: // error
-      break;
-  }
-
-  return data;
-}
-
 //--------------------------------------------------------------------------
 // GetMuMinus (public)
 //--------------------------------------------------------------------------

src/include/PRunAsymmetryBNMR.h

@@ -0,0 +1,89 @@
+/***************************************************************************
+
+  PRunAsymmetry.h
+
+  Author: Andreas Suter
+  e-mail: andreas.suter@psi.ch
+
+***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2007-2016 by Andreas Suter                              *
+ *   andreas.suter@psi.ch                                                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _PRUNASYMMETRYBNMR_H_
+#define _PRUNASYMMETRYBNMR_H_
+
+#include "PRunBase.h"
+
+//---------------------------------------------------------------------------
+/**
+ * <p>Class handling the asymmetry fit.
+ */
+class PRunAsymmetryBNMR : public PRunBase
+{
+  public:
+    PRunAsymmetryBNMR();
+    PRunAsymmetryBNMR(PMsrHandler *msrInfo, PRunDataHandler *rawData, UInt_t runNo, EPMusrHandleTag tag);
+    virtual ~PRunAsymmetryBNMR();
+
+    virtual Double_t CalcChiSquare(const std::vector<Double_t>& par);
+    virtual Double_t CalcChiSquareExpected(const std::vector<Double_t>& par);
+    virtual Double_t CalcMaxLikelihood(const std::vector<Double_t>& par);
+    virtual void CalcTheory();
+
+    virtual UInt_t GetNoOfFitBins();
+
+    virtual void SetFitRangeBin(const TString fitRange);
+
+    virtual Int_t GetStartTimeBin() { return fStartTimeBin; }
+    virtual Int_t GetEndTimeBin() { return fEndTimeBin; }
+    virtual Int_t GetPacking() { return fPacking; }
+
+  protected:
+    virtual void CalcNoOfFitBins();
+    virtual Bool_t PrepareData();
+    virtual Bool_t PrepareFitData();
+    virtual Bool_t PrepareViewData(PRawRunData* runData, UInt_t histoNo[2]);
+    virtual Bool_t PrepareRRFViewData(PRawRunData* runData, UInt_t histoNo[2]);
+
+  private:
+    UInt_t fAlphaBetaTag; ///< \f$ 1 \to \alpha = \beta = 1\f$; \f$ 2 \to \alpha \neq 1, \beta = 1\f$; \f$ 3 \to \alpha = 1, \beta \neq 1\f$; \f$ 4 \to \alpha \neq 1, \beta \neq 1\f$.
+    UInt_t fNoOfFitBins;  ///< number of bins to be be fitted
+    Int_t fPacking;       ///< packing for this particular run. Either given in the RUN- or GLOBAL-block.
+
+    PDoubleVector fForward;     ///< forward histo data
+    PDoubleVector fForwardErr;  ///< forward histo errors
+    PDoubleVector fBackward;    ///< backward histo data
+    PDoubleVector fBackwardErr; ///< backward histo errors
+
+    Int_t fGoodBins[4];   ///< keep first/last good bins. 0=fgb, 1=lgb (forward); 2=fgb, 3=lgb (backward)
+
+    Int_t fStartTimeBin;    ///< bin at which the fit starts
+    Int_t fEndTimeBin;      ///< bin at which the fit ends
+
+    Bool_t SubtractFixBkg();
+    Bool_t SubtractEstimatedBkg();
+
+    virtual Bool_t GetProperT0(PRawRunData* runData, PMsrGlobalBlock *globalBlock, PUIntVector &forwardHisto, PUIntVector &backwardHistoNo);
+    virtual Bool_t GetProperDataRange(PRawRunData* runData, UInt_t histoNo[2]);
+    virtual void GetProperFitRange(PMsrGlobalBlock *globalBlock);
+};
+
+#endif // _PRUNASYMMETRYBNMR_H_