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

removed Area since it is the same as 'Beamline Name'

Browse Source
This commit is contained in:
suter_a 2012-03-22 12:53:45 +00:00
parent 4f676cbab0
commit 315691741c
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/classes/PMusr.cpp
View File

@ -516,7 +516,6 @@ PRawRunData::PRawRunData()
fLaboratory = TString("n/a"); fLaboratory = TString("n/a");
fBeamline = TString("n/a"); fBeamline = TString("n/a");
fInstrument = TString("n/a"); fInstrument = TString("n/a");
fArea = TString("n/a");
fMuonSource = TString("n/a"); fMuonSource = TString("n/a");
fMuonSpecies = TString("n/a"); fMuonSpecies = TString("n/a");
fMuonBeamMomentum = PMUSR_UNDEFINED; fMuonBeamMomentum = PMUSR_UNDEFINED;

8
src/classes/PRunDataHandler.cpp
View File

@ -1441,10 +1441,6 @@ Bool_t PRunDataHandler::ReadRootFile()
if (ok) if (ok)
runData.SetLaboratory(str); runData.SetLaboratory(str);
header->Get("RunInfo/Area", str, ok);
if (ok)
runData.SetArea(str);
header->Get("RunInfo/Instrument", str, ok); header->Get("RunInfo/Instrument", str, ok);
if (ok) if (ok)
runData.SetInstrument(str); runData.SetInstrument(str);
@ -4025,8 +4021,6 @@ Bool_t PRunDataHandler::WriteMusrRootFile(TString fln)
header->Set("RunInfo/Run Duration", prop); header->Set("RunInfo/Run Duration", prop);
str = fData[0].GetLaboratory()->Copy(); str = fData[0].GetLaboratory()->Copy();
header->Set("RunInfo/Laboratory", str); header->Set("RunInfo/Laboratory", str);
str = fData[0].GetArea()->Copy();
header->Set("RunInfo/Area", str);
str = fData[0].GetInstrument()->Copy(); str = fData[0].GetInstrument()->Copy();
header->Set("RunInfo/Instrument", str); header->Set("RunInfo/Instrument", str);
dval[0] = fData[0].GetMuonBeamMomentum(); dval[0] = fData[0].GetMuonBeamMomentum();
@ -5178,7 +5172,7 @@ Bool_t PRunDataHandler::WriteMudFile(TString fln)
MUD_setTimeEnd(fd, fData[0].GetStopDateTime()); MUD_setTimeEnd(fd, fData[0].GetStopDateTime());
MUD_setTitle(fd, (char *)fData[0].GetRunTitle()->Data()); MUD_setTitle(fd, (char *)fData[0].GetRunTitle()->Data());
MUD_setLab(fd, (char *)fData[0].GetLaboratory()->Data()); MUD_setLab(fd, (char *)fData[0].GetLaboratory()->Data());
MUD_setArea(fd, (char *)fData[0].GetArea()->Data()); MUD_setArea(fd, (char *)fData[0].GetBeamline()->Data());
MUD_setMethod(fd, (char *)fData[0].GetSetup()->Data()); MUD_setMethod(fd, (char *)fData[0].GetSetup()->Data());
MUD_setApparatus(fd, (char *)fData[0].GetInstrument()->Data()); MUD_setApparatus(fd, (char *)fData[0].GetInstrument()->Data());
MUD_setInsert(fd, dummy); MUD_setInsert(fd, dummy);

3
src/include/PMusr.h
View File

@ -356,7 +356,6 @@ class PRawRunData {
virtual const TString* GetLaboratory() { return &fLaboratory; } virtual const TString* GetLaboratory() { return &fLaboratory; }
virtual const TString* GetBeamline() { return &fBeamline; } virtual const TString* GetBeamline() { return &fBeamline; }
virtual const TString* GetInstrument() { return &fInstrument; } virtual const TString* GetInstrument() { return &fInstrument; }
virtual const TString* GetArea() { return &fArea; }
virtual const TString* GetRunName() { return &fRunName; } virtual const TString* GetRunName() { return &fRunName; }
virtual const TString* GetMuonSource() { return &fMuonSource; } virtual const TString* GetMuonSource() { return &fMuonSource; }
virtual const TString* GetMuonSpecies() { return &fMuonSpecies; } virtual const TString* GetMuonSpecies() { return &fMuonSpecies; }
@ -404,7 +403,6 @@ class PRawRunData {
virtual void SetLaboratory(const TString &str) { fLaboratory = str; } virtual void SetLaboratory(const TString &str) { fLaboratory = str; }
virtual void SetBeamline(const TString &str) { fBeamline = str; } virtual void SetBeamline(const TString &str) { fBeamline = str; }
virtual void SetInstrument(const TString &str) { fInstrument = str; } virtual void SetInstrument(const TString &str) { fInstrument = str; }
virtual void SetArea(const TString &str) { fArea = str; }
virtual void SetMuonSource(const TString &str) { fMuonSource = str; } virtual void SetMuonSource(const TString &str) { fMuonSource = str; }
virtual void SetMuonSpecies(const TString &str) { fMuonSpecies = str; } virtual void SetMuonSpecies(const TString &str) { fMuonSpecies = str; }
virtual void SetMuonBeamMomentum(const Double_t dval) { fMuonBeamMomentum = dval; } virtual void SetMuonBeamMomentum(const Double_t dval) { fMuonBeamMomentum = dval; }
@ -445,7 +443,6 @@ class PRawRunData {
TString fLaboratory; ///< keeps the name of the laboratory, e.g. PSI, ISIS, TRIUMF, JPARC TString fLaboratory; ///< keeps the name of the laboratory, e.g. PSI, ISIS, TRIUMF, JPARC
TString fBeamline; ///< keeps the name of the be beamline, e.g. muE4, piM3.1, ... TString fBeamline; ///< keeps the name of the be beamline, e.g. muE4, piM3.1, ...
TString fInstrument; ///< keeps the name of the instrument, e.g. LEM, GPS, MUSR, EMU, ... TString fInstrument; ///< keeps the name of the instrument, e.g. LEM, GPS, MUSR, EMU, ...
TString fArea; ///< keeps the beam area
TString fMuonSource; ///< keeps the type of muon source, e.g. continous surface beam, pulsed beam, low energy muon beam TString fMuonSource; ///< keeps the type of muon source, e.g. continous surface beam, pulsed beam, low energy muon beam
TString fMuonSpecies; ///< positive muon or negative muon TString fMuonSpecies; ///< positive muon or negative muon
Double_t fMuonBeamMomentum; ///< given in MeV/c, for LEM this is the momentum of the secondary beamline and NOT the momentum of the low energy beam Double_t fMuonBeamMomentum; ///< given in MeV/c, for LEM this is the momentum of the secondary beamline and NOT the momentum of the low energy beam