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

Merged muonspin/musrfit/root6 into master

Browse Source
This commit is contained in:
Zaher Salman
2017-02-08 15:17:56 +01:00
parent ddfb845755 ab15fa833e
commit effc6095a5
38 changed files with 117 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/classes/Makefile.PMusr
View File

@ -202,27 +202,27 @@ $(EXTOBJS): ../external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp
TLemRunHeaderDict.cxx: ../external/TLemRunHeader/TLemRunHeader.h ../external/TLemRunHeader/TLemRunHeaderLinkDef.h
@echo "Generating dictionary $@..."
rootcint -f $@ -c -p $^
rootcling -f $@ -c -p $^
TLemStatsDict.cxx: ../external/TLemRunHeader/TLemStats.h ../external/TLemRunHeader/TLemStatsLinkDef.h
@echo "Generating dictionary $@..."
rootcint -f $@ -c -p $^
rootcling -f $@ -c -p $^
PStartupHandlerDict.cpp: ../include/PStartupHandler.h ../include/PStartupHandlerLinkDef.h
@echo "Generating dictionary $@..."
rootcint -f $@ -c -p $^
rootcling -f $@ -c -p $^
PMusrCanvasDict.cpp: ../include/PMusrCanvas.h ../include/PMusrCanvasLinkDef.h
@echo "Generating dictionary $@..."
rootcint -v -f $@ -c -p $^
rootcling -v -f $@ -c -p $^
PMusrT0Dict.cpp: ../include/PMusrT0.h ../include/PMusrT0LinkDef.h
@echo "Generating dictionary $@..."
rootcint -v -f $@ -c -p $^
rootcling -v -f $@ -c -p $^
PUserFcnBaseDict.cpp: ../include/PUserFcnBase.h ../include/PUserFcnBaseLinkDef.h
@echo "Generating dictionary $@..."
rootcint -v -f $@ -c -p $^
rootcling -v -f $@ -c -p $^
install: leminstall musrinstall

2
src/classes/Makefile.PUserFcn
View File

@ -89,7 +89,7 @@ $(OBJS): %.o: %.cpp
PUserFcnDict.cpp: ../include/PUserFcn.h ../include/PUserFcnLinkDef.h
@echo "Generating dictionary $@..."
rootcint -f $@ -c -p $^
rootcling -f $@ -c -p $^
install: all
@echo "Installing shared lib: libPUserFcn.so ( you must be root ;-) )"

2
src/classes/Makefile.am
View File

@ -103,7 +103,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPUserFcnBase.la libPMusr.la

2
src/external/BMWtools/BMWStartupHandlerLinkDef.h vendored
View File

@ -4,8 +4,6 @@
Author: Bastian M. Wojek
$Id$
***************************************************************************/
/***************************************************************************

2
src/external/BMWtools/Makefile.am vendored
View File

@ -33,7 +33,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
lib_LTLIBRARIES = libBMWtools.la

2
src/external/MagProximity/Makefile.am vendored
View File

@ -39,7 +39,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPMagProximityFitter.la

2
src/external/MusrRoot/Makefile.am vendored
View File

@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
lib_LTLIBRARIES = libTMusrRunHeader.la

2
src/external/Nonlocal/Makefile.am vendored
View File

@ -39,7 +39,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPNL_PippardFitter.la

6
src/external/Nonlocal/PNL_PippardFitter.h vendored
View File

@ -31,9 +31,9 @@
#define _PNL_PIPPARDFITTER_H_
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
//#ifdef __CINT__
//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
//#endif
#include <fftw3.h>
#include "PUserFcnBase.h"

2
src/external/Nonlocal/PNL_StartupHandlerLinkDef.h vendored
View File

@ -5,8 +5,6 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id$
***************************************************************************/
/***************************************************************************

2
src/external/TLemRunHeader/Makefile.am vendored
View File

@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cxx *Dict.h *Dict* *~ core
%Dict.cxx %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cxx -c -p $(INCLUDES) $^
@ROOTCLING@ -v -f $*Dict.cxx -c -p $(INCLUDES) $^
lib_LTLIBRARIES = libTLemRunHeader.la

2
src/external/libBNMR/Makefile.am vendored
View File

@ -26,7 +26,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libBNMR.la

4
src/external/libBNMR/Makefile.libBNMR vendored
View File

@ -46,11 +46,11 @@ clean:; @rm -f $(OBJS) *Dict* core*
$(OBJS): %.o: %.cpp
$(CXX) $(INCLUDES) $(CXXFLAGS) -c $<
# Generate the ROOT CINT dictionary
# Generate the ROOT CLING dictionary
TlibBNMRDict.cpp: TBNMR.h TBNMRLinkDef.h
@echo "Generating dictionary $@..."
rootcint -f $@ -c -p -I$(ROOTINCLUDE) $^
rootcling -f $@ -c -p -I$(ROOTINCLUDE) $^
install: all
@echo "Installing shared lib: libTApproximation.so"

2
src/external/libCalcMeanFieldsLEM/Makefile.am vendored
View File

@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libCalcMeanFieldsLEM.la

2
src/external/libFitPofB/classes/Makefile.am vendored
View File

@ -50,7 +50,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ ../include/*~ core
%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libFitPofB.la

6
src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h vendored
View File

@ -34,9 +34,9 @@
using namespace std;
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
//#ifdef __CINT__
//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
//#endif
#include "fftw3.h"
/**

6
src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h vendored
View File

@ -35,9 +35,9 @@
using namespace std;
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
//#ifdef __CINT__
//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
//#endif
#include "fftw3.h"
//--------------------

6
src/external/libFitPofB/include/TPofTCalc.h vendored
View File

@ -32,9 +32,9 @@
#include "TPofBCalc.h"
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
//#ifdef __CINT__
//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
//#endif
#include "fftw3.h"
#include <string>

2
src/external/libGapIntegrals/Makefile.am vendored
View File

@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libGapIntegrals.la

2
src/external/libGbGLF/Makefile.am vendored
View File

@ -26,7 +26,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libGbGLF.la

2
src/external/libLFRelaxation/Makefile.am vendored
View File

@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libLFRelaxation.la

6
src/external/libLFRelaxation/TLFRelaxation.h vendored
View File

@ -39,9 +39,9 @@ using namespace std;
#include "PUserFcnBase.h"
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
//#ifdef __CINT__
//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
//#endif
#include "fftw3.h"
#include "BMWIntegrator.h"

2
src/external/libPhotoMeissner/classes/Makefile.am vendored
View File

@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = ../classes/*Dict* ../include/*Dict.* *~ core
%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPPhotoMeissner.la

2
src/external/libSpinValve/classes/Makefile.am vendored
View File

@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = ../classes/*Dict.* ../include/*Dict.* *~ core
%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPSpinValve.la

2
src/external/libZFRelaxation/Makefile.am vendored
View File

@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libZFRelaxation.la

6
src/include/PMusr.h
View File

@ -37,9 +37,9 @@ using namespace std;
#include <TString.h>
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
//#ifdef __CINT__
//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
//#endif
#include "fftw3.h"
#define PMUSR_SUCCESS 0

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();
@ -277,10 +277,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

3
src/musredit_qt5/PMusrEditAbout.cpp
View File

@ -27,6 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "git-revision.h"
#include "PMusrEditAbout.h"
//---------------------------------------------------------------------------
@ -37,6 +38,8 @@ PMusrEditAbout::PMusrEditAbout(QWidget *parent, Qt::WindowFlags f) : QDialog(par
{
setupUi(this);
fGitRev_label->setText(QString("git: %1").arg(GIT_REVISION));
setModal(true);
}

27
src/musredit_qt5/forms/PMusrEditAbout.ui
View File

@ -14,16 +14,16 @@
<string>Musr Edit About</string>
</property>
<property name="windowIcon">
<iconset resource="../musredit.qrc">
<iconset>
<normaloff>:/images/musrfit.xpm</normaloff>:/images/musrfit.xpm</iconset>
</property>
<widget class="QWidget" name="layoutWidget">
<widget class="QWidget" name="">
<property name="geometry">
<rect>
<x>11</x>
<y>11</y>
<x>12</x>
<y>12</y>
<width>371</width>
<height>169</height>
<height>161</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@ -46,6 +46,23 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="fGitRev_label">
<property name="font">
<font>
<weight>75</weight>
<italic>true</italic>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>git:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="fDetails_label">
<property name="text">

2
src/musrt0.cpp
View File

@ -111,7 +111,7 @@ Bool_t musrt0_item(TApplication &app, PMsrHandler *msrHandler, PMusrT0Data &data
// set timeout
musrT0->SetTimeout(timeout);
// set the msr-file handler. The handler cannot be transfered at construction time since rootcint is not able to handle the PMsrHandler class
// set the msr-file handler. The handler cannot be transfered at construction time since rootcling is not able to handle the PMsrHandler class
musrT0->SetMsrHandler(msrHandler);
// check if only t0, data-, and bkg-range is wished, if not, only initialize t0 at this point

2
src/musrview.cpp
View File

@ -330,7 +330,7 @@ int main(int argc, char *argv[])
musrCanvas->SetTimeout(timeout);
// ugly but rootcint cannot handle the spirit-parser framework
// ugly but rootcling cannot handle the spirit-parser framework
musrCanvas->SetMsrHandler(msrHandler);
musrCanvas->SetRunListCollection(runListCollection);

2
src/tests/MuTransition/PSimulateMuTransitionLinkDef.h
View File

@ -29,7 +29,7 @@
***************************************************************************/
// changed for root6
#ifdef __CLING__
#ifdef __CINT__
#pragma link off all globals;
#pragma link off all classes;