From 32d99706591ec43fa3d2a35f9a4954e99246ab8a Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Wed, 24 Dec 2025 14:03:44 +0100 Subject: [PATCH] adopted from AFS to NFS. --- src/classes/PStartupHandler.cpp | 48 +++++++++---------- .../MagProximity/mag_proximity_startup.xml | 2 +- src/tests/nonlocal/In_37_T2P83_E14P1.inp | 2 +- src/tests/nonlocal/nonlocal.cpp | 4 +- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/classes/PStartupHandler.cpp b/src/classes/PStartupHandler.cpp index 89945aa63..18a46882f 100644 --- a/src/classes/PStartupHandler.cpp +++ b/src/classes/PStartupHandler.cpp @@ -752,9 +752,8 @@ void PStartupHandler::OnCdataBlock(const Char_t *str, Int_t len) * * Default Data Paths: * Standard PSI facility data directories: - * - /mnt/data/nemu/his, /mnt/data/nemu/wkm - * - /afs/psi.ch/project/nemu/data/his, /afs/psi.ch/project/nemu/data/wkm - * - /afs/psi.ch/project/bulkmusr/data/gps, dolly, gpd, ltf, alc + * - /mnt/data/nemu/his + * - /psi.ch/group/lmu/public/data/XXX/his/, where XXX=lem, alc, dolly, flame, gpd, gps, hal, ltf, or vms * * Default Markers: * ROOT TMarker style codes for distinguishing multiple data sets: @@ -781,14 +780,16 @@ void PStartupHandler::CheckLists() // check if any data path is given if (fDataPathList.size() == 0) { fDataPathList.push_back(TString("/mnt/data/nemu/his")); - fDataPathList.push_back(TString("/mnt/data/nemu/wkm")); - fDataPathList.push_back(TString("/afs/psi.ch/project/nemu/data/his")); - fDataPathList.push_back(TString("/afs/psi.ch/project/nemu/data/wkm")); - fDataPathList.push_back(TString("/afs/psi.ch/project/bulkmusr/data/gps")); - fDataPathList.push_back(TString("/afs/psi.ch/project/bulkmusr/data/dolly")); - fDataPathList.push_back(TString("/afs/psi.ch/project/bulkmusr/data/gpd")); - fDataPathList.push_back(TString("/afs/psi.ch/project/bulkmusr/data/ltf")); - fDataPathList.push_back(TString("/afs/psi.ch/project/bulkmusr/data/alc")); + fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/lem/his/")); + fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/alc/his/")); + fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/dolly/his/")); + fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/flame/his/")); + fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/gpd/his/")); + fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/gps/his/")); + fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/hal/his/")); + fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/ltf/his/")); + fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/misc/his/")); + fDataPathList.push_back(TString("/psi.ch/group/lmu/public/data/vms/his/")); } // check if any markers are given @@ -877,7 +878,7 @@ Bool_t PStartupHandler::StartupFileExists(Char_t *fln) * * Data Paths: * - PSI LEM, GPS, GPD, Dolly, Flame, HIFI, LTF, ALC data directories - * - Both local mount points and AFS paths + * - Both local mount points and NFS paths * * Run Name Templates: * - Templates for all PSI μSR instruments (GPS, GPD, Dolly, Flame, etc.) @@ -946,25 +947,22 @@ Bool_t PStartupHandler::WriteDefaultStartupFile(bool reset_startup_file) // write default musrfit_startup.xml fout << "" << std::endl; - fout << "" << std::endl; + fout << "" << std::endl; fout << " " << std::endl; fout << " Defines default settings for the musrfit package" << std::endl; fout << " " << std::endl; fout << " " << std::endl; fout << " no" << std::endl; fout << " /psi.ch/group/lmu/public/data/lem/his" << std::endl; - fout << " /afs/psi.ch/project/nemu/data/his" << std::endl; - fout << " /afs/psi.ch/project/nemu/data/wkm" << std::endl; - fout << " /afs/psi.ch/project/bulkmusr/data/misc" << std::endl; - fout << " /afs/psi.ch/project/bulkmusr/data/gps" << std::endl; - fout << " /afs/psi.ch/project/bulkmusr/data/dolly" << std::endl; - fout << " /afs/psi.ch/project/bulkmusr/data/gpd" << std::endl; - fout << " /afs/psi.ch/project/bulkmusr/data/ltf" << std::endl; - fout << " /afs/psi.ch/project/bulkmusr/data/alc/td" << std::endl; - fout << " /afs/psi.ch/project/bulkmusr/data/hifi" << std::endl; - fout << " /afs/psi.ch/project/bulkmusr/data/lem" << std::endl; - fout << " /afs/psi.ch/project/bulkmusr/data/flame" << std::endl; - fout << " /afs/psi.ch/project/bulkmusr/data/vms" << std::endl; + fout << " /psi.ch/group/lmu/public/data/alc/his" << std::endl; + fout << " /psi.ch/group/lmu/public/data/dolly/his" << std::endl; + fout << " /psi.ch/group/lmu/public/data/flame/his" << std::endl; + fout << " /psi.ch/group/lmu/public/data/gpd/his" << std::endl; + fout << " /psi.ch/group/lmu/public/data/gps/his" << std::endl; + fout << " /psi.ch/group/lmu/public/data/hal/his" << std::endl; + fout << " /psi.ch/group/lmu/public/data/ltf/his" << std::endl; + fout << " /psi.ch/group/lmu/public/data/misc/his" << std::endl; + fout << " /psi.ch/group/lmu/public/data/vms/his" << std::endl; fout << " " << std::endl; fout << " d%yyyy%/deltat_misc_%rrrr%.bin" << std::endl; fout << " " << std::endl; diff --git a/src/external/MagProximity/mag_proximity_startup.xml b/src/external/MagProximity/mag_proximity_startup.xml index 402ac07e7..3969b88a8 100644 --- a/src/external/MagProximity/mag_proximity_startup.xml +++ b/src/external/MagProximity/mag_proximity_startup.xml @@ -4,7 +4,7 @@ contains meta file infromation of the needed trim.sp files. - /afs/psi.ch/project/nemu/analysis/2010/EuS-Co/trimsp2 + /psi.ch/group/lmu/public/analysis/lem/2010/EuS-Co/trimsp2 EuS-Co_E 5030 diff --git a/src/tests/nonlocal/In_37_T2P83_E14P1.inp b/src/tests/nonlocal/In_37_T2P83_E14P1.inp index 337c32424..b3fbb201b 100644 --- a/src/tests/nonlocal/In_37_T2P83_E14P1.inp +++ b/src/tests/nonlocal/In_37_T2P83_E14P1.inp @@ -20,6 +20,6 @@ filmThickness = 300000.0 specular = 1 Bext = 41.19 deadLayer = 5.76 -%rgeFileName = /afs/psi.ch/project/nemu/analysis/2009/Nonlocal/trimsp/InSne141.rge +%rgeFileName = /psi.ch/group/lmu/public/analysis/lem/2009/Nonlocal/trimsp/InSne141.rge outputFileName = In_37_T2P83_E14P1.dat diff --git a/src/tests/nonlocal/nonlocal.cpp b/src/tests/nonlocal/nonlocal.cpp index 191ab58d4..82af57dde 100644 --- a/src/tests/nonlocal/nonlocal.cpp +++ b/src/tests/nonlocal/nonlocal.cpp @@ -48,8 +48,8 @@ void syntax() cout << endl << "specular = 1"; cout << endl << "Bext = 47.14"; cout << endl << "deadLayer = 0.4"; - cout << endl << "rgeFileName = /afs/psi.ch/project/nemu/analysis/2009/Nonlocal/trimsp/InSn_E6000.rge"; - cout << endl << "rgeFileName = /afs/psi.ch/project/nemu/analysis/2009/Nonlocal/trimsp/InSn_E14100.rge"; + cout << endl << "rgeFileName = /psi.ch/group/lmu/public/analysis/lem/2009/Nonlocal/trimsp/InSn_E6000.rge"; + cout << endl << "rgeFileName = /psi.ch/group/lmu/public/analysis/lem/2009/Nonlocal/trimsp/InSn_E14100.rge"; cout << endl << "outputFileName = In_37_T2P83.dat"; cout << endl << "outputFileNameBmean = In_37_T2P83_Bmean.dat"; cout << endl << endl;