From d58d7f36e1efa7511815e0ad4ecede91bb0e83ba Mon Sep 17 00:00:00 2001
From: nemu <nemu>
Date: Tue, 10 Nov 2009 11:34:27 +0000
Subject: [PATCH] (i) added that LEM afs paths to musrfit_startup.xml. (ii)
 fixed the resize errors (0/1 issue)

---
 src/classes/PMusr.cpp   | 18 +++++++++---------
 src/musrfit_startup.xml |  2 ++
 src/musrt0.cpp          |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/classes/PMusr.cpp b/src/classes/PMusr.cpp
index 00dc58f5..dea9bbbc 100644
--- a/src/classes/PMusr.cpp
+++ b/src/classes/PMusr.cpp
@@ -596,7 +596,7 @@ TString* PMsrRunBlock::GetRunName(UInt_t i)
  */
 void PMsrRunBlock::SetRunName(TString &str, UInt_t i)
 {
-  if (i>fRunName.size())
+  if (i >= fRunName.size())
     fRunName.resize(i+1);
 
   fRunName[i] = str;
@@ -628,7 +628,7 @@ TString* PMsrRunBlock::GetBeamline(UInt_t i)
  */
 void PMsrRunBlock::SetBeamline(TString &str, UInt_t i)
 {
-  if (i>fBeamline.size())
+  if (i >= fBeamline.size())
     fBeamline.resize(i+1);
 
   fBeamline[i] = str;
@@ -660,7 +660,7 @@ TString* PMsrRunBlock::GetInstitute(UInt_t i)
  */
 void PMsrRunBlock::SetInstitute(TString &str, UInt_t i)
 {
-  if (i>fInstitute.size())
+  if (i >= fInstitute.size())
     fInstitute.resize(i+1);
 
   fInstitute[i] = str;
@@ -692,7 +692,7 @@ TString* PMsrRunBlock::GetFileFormat(UInt_t i)
  */
 void PMsrRunBlock::SetFileFormat(TString &str, UInt_t i)
 {
-  if (i>fFileFormat.size())
+  if (i >= fFileFormat.size())
     fFileFormat.resize(i+1);
 
   fFileFormat[i] = str;
@@ -724,7 +724,7 @@ Int_t PMsrRunBlock::GetMap(UInt_t i)
  */
 void PMsrRunBlock::SetMap(Int_t mapVal, UInt_t idx)
 {
-  if (idx>fMap.size())
+  if (idx >= fMap.size())
     fMap.resize(idx+1);
 
   fMap[idx] = mapVal;
@@ -756,7 +756,7 @@ Double_t PMsrRunBlock::GetBkgFix(UInt_t i)
  */
 void PMsrRunBlock::SetBkgFix(Double_t dval, UInt_t idx)
 {
-  if (idx>fBkgFix.size())
+  if (idx >= fBkgFix.size())
     fBkgFix.resize(idx+1);
 
   fBkgFix[idx] = dval;
@@ -789,7 +789,7 @@ Int_t PMsrRunBlock::GetBkgRange(UInt_t i)
  */
 void PMsrRunBlock::SetBkgRange(Int_t ival, UInt_t idx)
 {
-  if (idx > fBkgRange.size())
+  if (idx >= fBkgRange.size())
     fBkgRange.resize(idx+1);
 
   fBkgRange[idx] = ival;
@@ -822,7 +822,7 @@ Int_t PMsrRunBlock::GetDataRange(UInt_t i)
  */
 void PMsrRunBlock::SetDataRange(Int_t ival, UInt_t idx)
 {
-  if (idx > fDataRange.size())
+  if (idx >= fDataRange.size())
     fDataRange.resize(idx+1);
 
   fDataRange[idx] = ival;
@@ -854,7 +854,7 @@ Int_t PMsrRunBlock::GetT0(UInt_t i)
  */
 void PMsrRunBlock::SetT0(Int_t ival, UInt_t idx)
 {
-  if (idx>fT0.size())
+  if (idx >= fT0.size())
     fT0.resize(idx+1);
 
   fT0[idx] = ival;
diff --git a/src/musrfit_startup.xml b/src/musrfit_startup.xml
index 8db4bfea..93e15ac3 100644
--- a/src/musrfit_startup.xml
+++ b/src/musrfit_startup.xml
@@ -6,6 +6,8 @@
     </comment>
     <data_path>/mnt/data/nemu/his</data_path>
     <data_path>/mnt/data/nemu/wkm</data_path>
+    <data_path>/afs/psi.ch/project/nemu/data/his</data_path>
+    <data_path>/afs/psi.ch/project/nemu/data/wkm</data_path>
     <data_path>/afs/psi.ch/project/bulkmusr/data/gps</data_path>
     <data_path>/afs/psi.ch/project/bulkmusr/data/dolly</data_path>
     <data_path>/afs/psi.ch/project/bulkmusr/data/gpd</data_path>
diff --git a/src/musrt0.cpp b/src/musrt0.cpp
index 87d19c16..e14166ca 100644
--- a/src/musrt0.cpp
+++ b/src/musrt0.cpp
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
   }
 
   // read all the necessary runs (raw data)
-  PRunDataHandler *dataHandler;
+  PRunDataHandler *dataHandler = 0;
   if (success) {
     if (startupHandler)
       dataHandler = new PRunDataHandler(msrHandler, startupHandler->GetDataPathList());