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

start adding triumf mud-file-format support. For a few days musrfit will be a bit frail.

Browse Source
This commit is contained in:
nemu
2009-09-30 06:54:37 +00:00
parent dc367a89a5
commit dcb77c2e48
17 changed files with 7209 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/classes/Makefile.am
View File

@ -65,7 +65,7 @@ dict_cpp_sources = \
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
INCLUDES = -I$(top_srcdir)/src/include $(PSIBIN_CFLAGS) $(LEM_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
INCLUDES = -I$(top_srcdir)/src/include $(PSIBIN_CFLAGS) $(MUD_CFLAGS) $(LEM_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
@ -78,7 +78,7 @@ CLEANFILES = *Dict.cpp *Dict.h *~ core
lib_LTLIBRARIES = libPMusr.la
libPMusr_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
libPMusr_la_LIBADD = $(PSIBIN_LIBS) $(LEM_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS)
libPMusr_la_LIBADD = $(PSIBIN_LIBS) $(MUD_LIBS) $(LEM_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS)
libPMusr_la_LDFLAGS = -version-info $(MUSR_LIBRARY_VERSION) -release $(MUSR_RELEASE) $(AM_LDFLAGS)
pkgconfigdir = $(libdir)/pkgconfig

25
src/classes/PRunDataHandler.cpp
View File

@ -46,6 +46,8 @@ using namespace std;
#include "TLemRunHeader.h"
#include "MuSR_td_PSI_bin.h"
#include "mud.h"
#include "PRunDataHandler.h"
//--------------------------------------------------------------------------
@ -917,8 +919,6 @@ bool PRunDataHandler::ReadWkmFile()
*/
bool PRunDataHandler::ReadPsiBinFile()
{
// cout << endl << "PRunDataHandler::ReadPsiBinFile(): Sorry, not yet implemented ...";
MuSR_td_PSI_bin psiBin;
int status;
bool success;
@ -1044,8 +1044,25 @@ bool PRunDataHandler::ReadPsiBinFile()
*/
bool PRunDataHandler::ReadMudFile()
{
cout << endl << "PRunDataHandler::ReadMudFile(): Sorry, not yet implemented ...";
return false;
Int_t fh;
UINT32 type;
fh = MUD_openRead((char *)fRunPathName.Data(), &type);
if (fh == -1) {
cerr << endl << "**ERROR** Couldn't open mud-file " << fRunPathName.Data() << ", sorry.";
cerr << endl;
return false;
}
// read necessary header information
// STILL MISSING
// read histograms
// STILL MISSING
MUD_closeRead(fh);
return true;
}
//--------------------------------------------------------------------------