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

(i) added that LEM afs paths to musrfit_startup.xml. (ii) fixed the resize errors (0/1 issue)

Browse Source
This commit is contained in:
nemu 2009-11-10 11:34:27 +00:00
parent 8943295bef
commit d58d7f36e1
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/classes/PMusr.cpp
View File

@ -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;

2
src/musrfit_startup.xml
View File

@ -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>

2
src/musrt0.cpp
View File

@ -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());