From 315691741c7ef1aef13ea702bb5d05b892284e08 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Thu, 22 Mar 2012 12:53:45 +0000
Subject: [PATCH] removed Area since it is the same as 'Beamline Name'

---
 src/classes/PMusr.cpp           | 1 -
 src/classes/PRunDataHandler.cpp | 8 +-------
 src/include/PMusr.h             | 3 ---
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/classes/PMusr.cpp b/src/classes/PMusr.cpp
index a5951699..4fe1810b 100644
--- a/src/classes/PMusr.cpp
+++ b/src/classes/PMusr.cpp
@@ -516,7 +516,6 @@ PRawRunData::PRawRunData()
   fLaboratory = TString("n/a");
   fBeamline = TString("n/a");
   fInstrument = TString("n/a");
-  fArea = TString("n/a");
   fMuonSource = TString("n/a");
   fMuonSpecies = TString("n/a");
   fMuonBeamMomentum = PMUSR_UNDEFINED;
diff --git a/src/classes/PRunDataHandler.cpp b/src/classes/PRunDataHandler.cpp
index e8910a93..26ee1796 100644
--- a/src/classes/PRunDataHandler.cpp
+++ b/src/classes/PRunDataHandler.cpp
@@ -1441,10 +1441,6 @@ Bool_t PRunDataHandler::ReadRootFile()
     if (ok)
       runData.SetLaboratory(str);
 
-    header->Get("RunInfo/Area", str, ok);
-    if (ok)
-      runData.SetArea(str);
-
     header->Get("RunInfo/Instrument", str, ok);
     if (ok)
       runData.SetInstrument(str);
@@ -4025,8 +4021,6 @@ Bool_t PRunDataHandler::WriteMusrRootFile(TString fln)
   header->Set("RunInfo/Run Duration", prop);
   str = fData[0].GetLaboratory()->Copy();
   header->Set("RunInfo/Laboratory", str);
-  str = fData[0].GetArea()->Copy();
-  header->Set("RunInfo/Area", str);
   str = fData[0].GetInstrument()->Copy();
   header->Set("RunInfo/Instrument", str);
   dval[0] = fData[0].GetMuonBeamMomentum();
@@ -5178,7 +5172,7 @@ Bool_t PRunDataHandler::WriteMudFile(TString fln)
   MUD_setTimeEnd(fd, fData[0].GetStopDateTime());
   MUD_setTitle(fd, (char *)fData[0].GetRunTitle()->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_setApparatus(fd, (char *)fData[0].GetInstrument()->Data());
   MUD_setInsert(fd, dummy);
diff --git a/src/include/PMusr.h b/src/include/PMusr.h
index 08069afc..75f6fba0 100644
--- a/src/include/PMusr.h
+++ b/src/include/PMusr.h
@@ -356,7 +356,6 @@ class PRawRunData {
     virtual const TString* GetLaboratory() { return &fLaboratory; }
     virtual const TString* GetBeamline() { return &fBeamline; }
     virtual const TString* GetInstrument() { return &fInstrument; }
-    virtual const TString* GetArea() { return &fArea; }
     virtual const TString* GetRunName() { return &fRunName; }
     virtual const TString* GetMuonSource() { return &fMuonSource; }
     virtual const TString* GetMuonSpecies() { return &fMuonSpecies; }
@@ -404,7 +403,6 @@ class PRawRunData {
     virtual void SetLaboratory(const TString &str) { fLaboratory = str; }
     virtual void SetBeamline(const TString &str) { fBeamline = 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 SetMuonSpecies(const TString &str) { fMuonSpecies = str; }
     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 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 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 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