LMU/musrfit
5
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 4 Activity

merged from root6. Compiles but has issues with DKS linking yet.

Browse Source
This commit is contained in:
suter_a
2017-05-15 21:30:42 +02:00
parent 13106a51c7 25685b8989
commit 1729055385
334 changed files with 27556 additions and 4414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/PFourier.h
View File

@@ -34,6 +34,11 @@
#include "config.h"
#endif
//as the next 3 lines will need to be deleted as soon as DKS Fourier is back in place
#include <vector>
using namespace std;
#include "fftw3.h"
/*//as
#ifndef HAVE_DKS
#include <vector>
using namespace std;
@@ -43,6 +48,7 @@ using namespace std;
using namespace std;
#include "DKSBase.h"
#endif
*/
#include "Minuit2/FCNBase.h"
@@ -153,6 +159,7 @@ class PFourier
fftw_complex *fIn; ///< real part of the Fourier transform
fftw_complex *fOut; ///< imaginary part of the Fourier transform
/*//as
#ifdef HAVE_DKS
double *fInDKS; ///< real part of the Fourier transform
complex<double> *fOutDKS; ///< imaginary part of the Fourier transform
@@ -160,6 +167,7 @@ class PFourier
void *fReal_ptr; ///< real part of the Fourier on accelartor
void *fComp_ptr; ///< imaginary part of the Fourier on the acclerator
#endif
*/
virtual void PrepareFFTwInputData(UInt_t apodizationTag);
virtual void ApodizeData(Int_t apodizationTag);

14
src/include/PMusrCanvas.h
View File

@@ -45,10 +45,10 @@
#include <TLatex.h>
#include "PMusr.h"
#ifndef __MAKECINT__
#ifndef __MAKECLING__
#include "PMsrHandler.h"
#include "PRunListCollection.h"
#endif // __MAKECINT__
#endif // __MAKECLING__
#define YINFO 0.1
#define YTITLE 0.95
@@ -197,7 +197,7 @@ typedef vector<PMusrCanvasAsciiDump> PMusrCanvasAsciiDumpVector;
//--------------------------------------------------------------------------
/**
* <p>The preprocessor tag __MAKECINT__ is used to hide away from rootcint
* <p>The preprocessor tag __MAKECLING__ is used to hide away from rootcling
* the overly complex spirit header files.
*/
class PMusrCanvas : public TObject, public TQObject
@@ -216,10 +216,10 @@ class PMusrCanvas : public TObject, public TQObject
virtual Bool_t IsValid() { return fValid; }
#ifndef __MAKECINT__
#ifndef __MAKECLING__
virtual void SetMsrHandler(PMsrHandler *msrHandler);
virtual void SetRunListCollection(PRunListCollection *runList) { fRunList = runList; }
#endif // __MAKECINT__
#endif // __MAKECLING__
virtual void SetTimeout(Int_t ival);
virtual void UpdateParamTheoryPad();
@@ -278,10 +278,10 @@ class PMusrCanvas : public TObject, public TQObject
TH1F *fHistoFrame; ///< fHistoFrame is a 'global' frame needed in order to plot histograms with (potentially) different x-frames
#ifndef __MAKECINT__
#ifndef __MAKECLING__
PMsrHandler *fMsrHandler; ///< msr-file handler
PRunListCollection *fRunList; ///< data handler
#endif // __MAKECINT__
#endif // __MAKECLING__
PMusrCanvasDataSet fDataAvg; ///< set of all averaged data to be plotted (asymmetry/single histogram)

14
src/include/PMusrT0.h
View File

@@ -42,9 +42,9 @@
#include <TTimer.h>
#include "PMusr.h"
#ifndef __MAKECINT__
#ifndef __MAKECLING__
#include "PMsrHandler.h"
#endif // __MAKECINT__
#endif // __MAKECLING__
#define PMUSRT0_FORWARD 0
#define PMUSRT0_BACKWARD 1
@@ -113,7 +113,7 @@ class PMusrT0Data {
//--------------------------------------------------------------------------
/**
* <p>Handles the musrt0 graphical user interface.
* <p>The preprocessor tag __MAKECINT__ is used to hide away from rootcint
* <p>The preprocessor tag __MAKECLING__ is used to hide away from rootcling
* the overly complex spirit header files.
*/
class PMusrT0 : public TObject, public TQObject
@@ -131,18 +131,18 @@ class PMusrT0 : public TObject, public TQObject
virtual void Quit(); // SLOT
virtual void SetTimeout(Int_t timeout);
#ifndef __MAKECINT__
#ifndef __MAKECLING__
virtual void SetMsrHandler(PMsrHandler *msrHandler);
#endif // __MAKECINT__
#endif // __MAKECLING__
virtual void InitT0();
virtual void InitDataAndBkg();
virtual Int_t GetStatus() { return fStatus; }
private:
#ifndef __MAKECINT__
#ifndef __MAKECLING__
PMsrHandler *fMsrHandler; ///< msr-file handler
#endif // __MAKECINT__
#endif // __MAKECLING__
Int_t fTimeout; ///< timeout after which the Done signal should be emited. If timeout <= 0, no timeout is taking place
Bool_t fValid; ///< true if raw data set are available, otherwise false