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

fixed main problem of various runs with different labels for db-files

Browse Source
This commit is contained in:
nemu
2009-03-07 16:17:47 +00:00
parent 326e8262b4
commit 5e1dd892b0
5 changed files with 70 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/classes/PMusrCanvas.cpp
View File

@ -2166,8 +2166,8 @@ void PMusrCanvas::PlotData()
PMsrRunList runs = *fMsrHandler->GetMsrRunList(); PMsrRunList runs = *fMsrHandler->GetMsrRunList();
PMsrPlotStructure plotInfo = fMsrHandler->GetMsrPlotList()->at(fPlotNumber); PMsrPlotStructure plotInfo = fMsrHandler->GetMsrPlotList()->at(fPlotNumber);
unsigned int runNo = (unsigned int)plotInfo.fRuns[0].Re()-1; unsigned int runNo = (unsigned int)plotInfo.fRuns[0].Re()-1;
TString xAxisTitle = fRunList->GetXAxisTitle(runs[runNo].fRunName); TString xAxisTitle = fRunList->GetXAxisTitle(runs[runNo].fRunName, runNo);
TString yAxisTitle = fRunList->GetYAxisTitle(runs[runNo].fRunName); TString yAxisTitle = fRunList->GetYAxisTitle(runs[runNo].fRunName, runNo);
if (fNonMusrData.size() > 0) { if (fNonMusrData.size() > 0) {
// check if fMultiGraphData needs to be created, and if yes add all data and theory // check if fMultiGraphData needs to be created, and if yes add all data and theory
@ -2250,7 +2250,7 @@ void PMusrCanvas::PlotDifference()
PMsrRunList runs = *fMsrHandler->GetMsrRunList(); PMsrRunList runs = *fMsrHandler->GetMsrRunList();
PMsrPlotStructure plotInfo = fMsrHandler->GetMsrPlotList()->at(fPlotNumber); PMsrPlotStructure plotInfo = fMsrHandler->GetMsrPlotList()->at(fPlotNumber);
unsigned int runNo = (unsigned int)plotInfo.fRuns[0].Re()-1; unsigned int runNo = (unsigned int)plotInfo.fRuns[0].Re()-1;
TString xAxisTitle = fRunList->GetXAxisTitle(runs[runNo].fRunName); TString xAxisTitle = fRunList->GetXAxisTitle(runs[runNo].fRunName, runNo);
// if fMultiGraphDiff is not present create it and add the diff data // if fMultiGraphDiff is not present create it and add the diff data
if (!fMultiGraphDiff) { if (!fMultiGraphDiff) {

16
src/classes/PRunListCollection.cpp
View File

@ -484,12 +484,14 @@ const char* PRunListCollection::GetSetup(TString &runName)
/** /**
* <p> * <p>
* *
* \param runName * \param runName name of the run file
* \param idx msr-file run index
*/ */
const char* PRunListCollection::GetXAxisTitle(TString &runName) const char* PRunListCollection::GetXAxisTitle(TString &runName, const unsigned int idx)
{ {
PRawRunData *runData = fData->GetRunData(runName); PRawRunData *runData = fData->GetRunData(runName);
int index = fData->GetRunData(runName)->fDataNonMusr.fXIndex;
int index = fRunNonMusrList[idx]->GetXIndex();
// cout << endl << ">>PRunListCollection::GetXAxisTitle, x-index = " << index; // cout << endl << ">>PRunListCollection::GetXAxisTitle, x-index = " << index;
// cout << endl; // cout << endl;
@ -503,12 +505,14 @@ const char* PRunListCollection::GetXAxisTitle(TString &runName)
/** /**
* <p> * <p>
* *
* \param runName * \param runName name of the run file
* \param idx msr-file run index
*/ */
const char* PRunListCollection::GetYAxisTitle(TString &runName) const char* PRunListCollection::GetYAxisTitle(TString &runName, const unsigned int idx)
{ {
PRawRunData *runData = fData->GetRunData(runName); PRawRunData *runData = fData->GetRunData(runName);
int index = fData->GetRunData(runName)->fDataNonMusr.fYIndex;
int index = fRunNonMusrList[idx]->GetYIndex();
// cout << endl << ">>PRunListCollection::GetYAxisTitle, y-index = " << index; // cout << endl << ">>PRunListCollection::GetYAxisTitle, y-index = " << index;
// cout << endl; // cout << endl;

106
src/classes/PRunNonMusr.cpp
View File

@ -47,6 +47,8 @@ PRunNonMusr::PRunNonMusr() : PRunBase()
fNoOfFitBins = 0; fNoOfFitBins = 0;
fHandleTag = kEmpty; fHandleTag = kEmpty;
fRawRunData = 0;
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@ -60,6 +62,13 @@ PRunNonMusr::PRunNonMusr() : PRunBase()
*/ */
PRunNonMusr::PRunNonMusr(PMsrHandler *msrInfo, PRunDataHandler *rawData, unsigned int runNo, EPMusrHandleTag tag) : PRunBase(msrInfo, rawData, runNo, tag) PRunNonMusr::PRunNonMusr(PMsrHandler *msrInfo, PRunDataHandler *rawData, unsigned int runNo, EPMusrHandleTag tag) : PRunBase(msrInfo, rawData, runNo, tag)
{ {
// get the proper run
fRawRunData = fRawData->GetRunData(fRunInfo->fRunName);
if (!fRawRunData) { // couldn't get run
cout << endl << "PRunNonMusr::PRunNonMusr(): **ERROR** Couldn't get raw run data!";
fValid = false;
}
// calculate fData // calculate fData
if (!PrepareData()) if (!PrepareData())
fValid = false; fValid = false;
@ -169,44 +178,37 @@ bool PRunNonMusr::PrepareFitData()
{ {
bool success = true; bool success = true;
// get the proper run
PRawRunData* runData = fRawData->GetRunData(fRunInfo->fRunName);
if (!runData) { // couldn't get run
cout << endl << "PRunNonMusr::PrepareFitData(): **ERROR** Couldn't get run " << fRunInfo->fRunName.Data() << "!";
return false;
}
// keep start/stop time for fit: here the meaning is of course start x, stop x // keep start/stop time for fit: here the meaning is of course start x, stop x
fFitStartTime = fRunInfo->fFitRange[0]; fFitStartTime = fRunInfo->fFitRange[0];
fFitStopTime = fRunInfo->fFitRange[1]; fFitStopTime = fRunInfo->fFitRange[1];
// get x-, y-index // get x-, y-index
unsigned int xIndex = GetXIndex(runData); unsigned int xIndex = GetXIndex();
unsigned int yIndex = GetYIndex(runData); unsigned int yIndex = GetYIndex();
// cout << endl << ">> xIndex=" << xIndex << ", yIndex=" << yIndex; // cout << endl << ">> xIndex=" << xIndex << ", yIndex=" << yIndex;
// pack the raw data // pack the raw data
double value = 0.0; double value = 0.0;
double err = 0.0; double err = 0.0;
// cout << endl << ">> runData->fDataNonMusr.fData[" << xIndex << "].size()=" << runData->fDataNonMusr.fData[xIndex].size(); // cout << endl << ">> fRawRunData->fDataNonMusr.fData[" << xIndex << "].size()=" << fRawRunData->fDataNonMusr.fData[xIndex].size();
for (unsigned int i=0; i<runData->fDataNonMusr.fData[xIndex].size(); i++) { for (unsigned int i=0; i<fRawRunData->fDataNonMusr.fData[xIndex].size(); i++) {
// cout << endl << ">> i=" << i << ", packing=" << fRunInfo->fPacking; // cout << endl << ">> i=" << i << ", packing=" << fRunInfo->fPacking;
if (fRunInfo->fPacking == 1) { if (fRunInfo->fPacking == 1) {
fData.fX.push_back(runData->fDataNonMusr.fData[xIndex][i]); fData.fX.push_back(fRawRunData->fDataNonMusr.fData[xIndex][i]);
fData.fValue.push_back(runData->fDataNonMusr.fData[yIndex][i]); fData.fValue.push_back(fRawRunData->fDataNonMusr.fData[yIndex][i]);
fData.fError.push_back(runData->fDataNonMusr.fErrData[yIndex][i]); fData.fError.push_back(fRawRunData->fDataNonMusr.fErrData[yIndex][i]);
} else { // packed data, i.e. fRunInfo->fPacking > 1 } else { // packed data, i.e. fRunInfo->fPacking > 1
if ((i % fRunInfo->fPacking == 0) && (i != 0)) { // fill data if ((i % fRunInfo->fPacking == 0) && (i != 0)) { // fill data
// cout << endl << "-> i=" << i; // cout << endl << "-> i=" << i;
fData.fX.push_back(runData->fDataNonMusr.fData[xIndex][i]-(runData->fDataNonMusr.fData[xIndex][i]-runData->fDataNonMusr.fData[xIndex][i-fRunInfo->fPacking])/2.0); fData.fX.push_back(fRawRunData->fDataNonMusr.fData[xIndex][i]-(fRawRunData->fDataNonMusr.fData[xIndex][i]-fRawRunData->fDataNonMusr.fData[xIndex][i-fRunInfo->fPacking])/2.0);
fData.fValue.push_back(value); fData.fValue.push_back(value);
fData.fError.push_back(TMath::Sqrt(err)); fData.fError.push_back(TMath::Sqrt(err));
value = 0.0; value = 0.0;
err = 0.0; err = 0.0;
} }
// sum raw data values // sum raw data values
value += runData->fDataNonMusr.fData[yIndex][i]; value += fRawRunData->fDataNonMusr.fData[yIndex][i];
err += runData->fDataNonMusr.fErrData[yIndex][i]*runData->fDataNonMusr.fErrData[yIndex][i]; err += fRawRunData->fDataNonMusr.fErrData[yIndex][i]*fRawRunData->fDataNonMusr.fErrData[yIndex][i];
} }
} }
// cout << endl << ">> fData.fValue.size()=" << fData.fValue.size(); // cout << endl << ">> fData.fValue.size()=" << fData.fValue.size();
@ -235,44 +237,36 @@ bool PRunNonMusr::PrepareViewData()
{ {
bool success = true; bool success = true;
// get the proper run cout << endl << ">> fRunInfo->fRunName = " << fRunInfo->fRunName.Data();
PRawRunData* runData = fRawData->GetRunData(fRunInfo->fRunName);
if (!runData) { // couldn't get run
cout << endl << "PRunNonMusr::PrepareViewData(): **ERROR** Couldn't get run " << fRunInfo->fRunName.Data() << "!";
return false;
}
// get x-, y-index // get x-, y-index
unsigned int xIndex = GetXIndex(runData); unsigned int xIndex = GetXIndex();
unsigned int yIndex = GetYIndex(runData); unsigned int yIndex = GetYIndex();
// cout << endl << "PRunNonMusr::PrepareViewData: xIndex=" << xIndex << ", yIndex=" << yIndex << endl; cout << endl << "PRunNonMusr::PrepareViewData: xIndex=" << xIndex << ", yIndex=" << yIndex << endl;
// set x-, y-axis-index
runData->fDataNonMusr.fXIndex = xIndex;
runData->fDataNonMusr.fYIndex = yIndex;
// fill data histo // fill data histo
// pack the raw data // pack the raw data
double value = 0.0; double value = 0.0;
double err = 0.0; double err = 0.0;
// cout << endl << ">> runData->fDataNonMusr.fData[" << xIndex << "].size()=" << runData->fDataNonMusr.fData[xIndex].size(); // cout << endl << ">> fRawRunData->fDataNonMusr.fData[" << xIndex << "].size()=" << fRawRunData->fDataNonMusr.fData[xIndex].size();
for (unsigned int i=0; i<runData->fDataNonMusr.fData[xIndex].size(); i++) { for (unsigned int i=0; i<fRawRunData->fDataNonMusr.fData[xIndex].size(); i++) {
// cout << endl << ">> i=" << i << ", packing=" << fRunInfo->fPacking; // cout << endl << ">> i=" << i << ", packing=" << fRunInfo->fPacking;
if (fRunInfo->fPacking == 1) { if (fRunInfo->fPacking == 1) {
fData.fX.push_back(runData->fDataNonMusr.fData[xIndex][i]); fData.fX.push_back(fRawRunData->fDataNonMusr.fData[xIndex][i]);
fData.fValue.push_back(runData->fDataNonMusr.fData[yIndex][i]); fData.fValue.push_back(fRawRunData->fDataNonMusr.fData[yIndex][i]);
fData.fError.push_back(runData->fDataNonMusr.fErrData[yIndex][i]); fData.fError.push_back(fRawRunData->fDataNonMusr.fErrData[yIndex][i]);
} else { // packed data, i.e. fRunInfo->fPacking > 1 } else { // packed data, i.e. fRunInfo->fPacking > 1
if ((i % fRunInfo->fPacking == 0) && (i != 0)) { // fill data if ((i % fRunInfo->fPacking == 0) && (i != 0)) { // fill data
// cout << endl << "-> i=" << i; // cout << endl << "-> i=" << i;
fData.fX.push_back(runData->fDataNonMusr.fData[xIndex][i]-(runData->fDataNonMusr.fData[xIndex][i]-runData->fDataNonMusr.fData[xIndex][i-fRunInfo->fPacking])/2.0); fData.fX.push_back(fRawRunData->fDataNonMusr.fData[xIndex][i]-(fRawRunData->fDataNonMusr.fData[xIndex][i]-fRawRunData->fDataNonMusr.fData[xIndex][i-fRunInfo->fPacking])/2.0);
fData.fValue.push_back(value); fData.fValue.push_back(value);
fData.fError.push_back(TMath::Sqrt(err)); fData.fError.push_back(TMath::Sqrt(err));
value = 0.0; value = 0.0;
err = 0.0; err = 0.0;
} }
// sum raw data values // sum raw data values
value += runData->fDataNonMusr.fData[yIndex][i]; value += fRawRunData->fDataNonMusr.fData[yIndex][i];
err += runData->fDataNonMusr.fErrData[yIndex][i]*runData->fDataNonMusr.fErrData[yIndex][i]; err += fRawRunData->fDataNonMusr.fErrData[yIndex][i]*fRawRunData->fDataNonMusr.fErrData[yIndex][i];
} }
} }
// cout << endl << ">> fData.fValue.size()=" << fData.fValue.size(); // cout << endl << ">> fData.fValue.size()=" << fData.fValue.size();
@ -370,30 +364,29 @@ bool PRunNonMusr::PrepareViewData()
/** /**
* <p> * <p>
* *
* \param runData
*/ */
unsigned int PRunNonMusr::GetXIndex(PRawRunData* runData) unsigned int PRunNonMusr::GetXIndex()
{ {
unsigned int index = 0; unsigned int index = 0;
bool found = false; bool found = false;
// cout << endl << ">> PRunNonMusr::GetXIndex:"; //cout << endl << ">> PRunNonMusr::GetXIndex: fRawRunData->fDataNonMusr.fXIndex = " << fRawRunData->fDataNonMusr.fXIndex;
if (runData->fDataNonMusr.fXIndex >= 0) { // ascii-file format if (fRawRunData->fDataNonMusr.fXIndex >= 0) { // ascii-file format
// cout << endl << ">> PRunNonMusr::GetXIndex: ascii-file format"; //cout << endl << ">> PRunNonMusr::GetXIndex: ascii-file format";
index = runData->fDataNonMusr.fXIndex; index = fRawRunData->fDataNonMusr.fXIndex;
found = true; found = true;
} else { // db-file format } else { // db-file format
// cout << endl << ">> PRunNonMusr::GetXIndex: db-file format"; //cout << endl << ">> PRunNonMusr::GetXIndex: db-file format";
if (fRunInfo->fXYDataIndex[0] > 0) { // xy-data already indices if (fRunInfo->fXYDataIndex[0] > 0) { // xy-data already indices
// cout << endl << ">> PRunNonMusr::GetXIndex: xy-data already indices"; //cout << endl << ">> PRunNonMusr::GetXIndex: xy-data are already indices, i.e. not labels";
index = fRunInfo->fXYDataIndex[0]-1; // since xy-data start with 1 ... index = fRunInfo->fXYDataIndex[0]-1; // since xy-data start with 1 ...
found = true; found = true;
} else { // xy-data data tags which needs to be converted to an index } else { // xy-data data tags which needs to be converted to an index
// cout << endl << ">> fDataTags.size()=" << runData->fDataNonMusr.fDataTags.size(); //cout << endl << ">> fDataTags.size()=" << fRawRunData->fDataNonMusr.fDataTags.size();
for (unsigned int i=0; i<runData->fDataNonMusr.fDataTags.size(); i++) { for (unsigned int i=0; i<fRawRunData->fDataNonMusr.fDataTags.size(); i++) {
if (runData->fDataNonMusr.fDataTags[i].CompareTo(fRunInfo->fXYDataLabel[0]) == 0) { if (fRawRunData->fDataNonMusr.fDataTags[i].CompareTo(fRunInfo->fXYDataLabel[0]) == 0) {
// cout << endl << ">> i=" << i << ", runData->fDataNonMusr.fDataTags[i]=" << runData->fDataNonMusr.fDataTags[i].Data(); //cout << endl << ">> i=" << i << ", fRawRunData->fDataNonMusr.fDataTags[i]=" << fRawRunData->fDataNonMusr.fDataTags[i].Data();
// cout << endl << ">> fRunInfo->fXYDataLabel[0]=" << fRunInfo->fXYDataLabel[0].Data(); //cout << endl << ">> fRunInfo->fXYDataLabel[0]=" << fRunInfo->fXYDataLabel[0].Data();
index = i; index = i;
found = true; found = true;
break; break;
@ -417,25 +410,24 @@ unsigned int PRunNonMusr::GetXIndex(PRawRunData* runData)
/** /**
* <p> * <p>
* *
* \param runData
*/ */
unsigned int PRunNonMusr::GetYIndex(PRawRunData* runData) unsigned int PRunNonMusr::GetYIndex()
{ {
unsigned int index = 0; unsigned int index = 0;
bool found = false; bool found = false;
// cout << endl << ">> PRunNonMusr::GetYIndex:"; // cout << endl << ">> PRunNonMusr::GetYIndex:";
if (runData->fDataNonMusr.fYIndex >= 0) { // ascii-file format if (fRawRunData->fDataNonMusr.fYIndex >= 0) { // ascii-file format
index = runData->fDataNonMusr.fYIndex; index = fRawRunData->fDataNonMusr.fYIndex;
found = true; found = true;
} else { // db-file format } else { // db-file format
if (fRunInfo->fXYDataIndex[1] > 0) { // xy-data already indices if (fRunInfo->fXYDataIndex[1] > 0) { // xy-data already indices
index = fRunInfo->fXYDataIndex[1]-1; // since xy-data start with 1 ... index = fRunInfo->fXYDataIndex[1]-1; // since xy-data start with 1 ...
found = true; found = true;
} else { // xy-data data tags which needs to be converted to an index } else { // xy-data data tags which needs to be converted to an index
for (unsigned int i=0; i<runData->fDataNonMusr.fDataTags.size(); i++) { for (unsigned int i=0; i<fRawRunData->fDataNonMusr.fDataTags.size(); i++) {
if (runData->fDataNonMusr.fDataTags[i].CompareTo(fRunInfo->fXYDataLabel[1]) == 0) { if (fRawRunData->fDataNonMusr.fDataTags[i].CompareTo(fRunInfo->fXYDataLabel[1]) == 0) {
// cout << endl << ">> i=" << i << ", runData->fDataNonMusr.fDataTags[i]=" << runData->fDataNonMusr.fDataTags[i].Data(); // cout << endl << ">> i=" << i << ", fRawRunData->fDataNonMusr.fDataTags[i]=" << fRawRunData->fDataNonMusr.fDataTags[i].Data();
// cout << endl << ">> fRunInfo->fXYDataLabel[1]=" << fRunInfo->fXYDataLabel[1].Data(); // cout << endl << ">> fRunInfo->fXYDataLabel[1]=" << fRunInfo->fXYDataLabel[1].Data();
index = i; index = i;
found = true; found = true;

4
src/include/PRunListCollection.h
View File

@ -79,8 +79,8 @@ class PRunListCollection
virtual double GetField(TString &runName); virtual double GetField(TString &runName);
virtual double GetEnergy(TString &runName); virtual double GetEnergy(TString &runName);
virtual const char* GetSetup(TString &runName); virtual const char* GetSetup(TString &runName);
virtual const char* GetXAxisTitle(TString &runName); virtual const char* GetXAxisTitle(TString &runName, const unsigned int idx);
virtual const char* GetYAxisTitle(TString &runName); virtual const char* GetYAxisTitle(TString &runName, const unsigned int idx);
private: private:
PMsrHandler *fMsrInfo; ///< keeps all msr file info PMsrHandler *fMsrInfo; ///< keeps all msr file info

9
src/include/PRunNonMusr.h
View File

@ -32,6 +32,7 @@
#ifndef _PRUNNONMUSR_H_ #ifndef _PRUNNONMUSR_H_
#define _PRUNNONMUSR_H_ #define _PRUNNONMUSR_H_
#include "PMusr.h"
#include "PRunBase.h" #include "PRunBase.h"
class PRunNonMusr : public PRunBase class PRunNonMusr : public PRunBase
@ -47,18 +48,20 @@ class PRunNonMusr : public PRunBase
virtual unsigned int GetNoOfFitBins() { return fNoOfFitBins; } virtual unsigned int GetNoOfFitBins() { return fNoOfFitBins; }
virtual unsigned int GetXIndex();
virtual unsigned int GetYIndex();
protected: protected:
virtual bool PrepareData(); virtual bool PrepareData();
virtual bool PrepareFitData(); virtual bool PrepareFitData();
virtual bool PrepareViewData(); virtual bool PrepareViewData();
private: private:
PRawRunData *fRawRunData;
double fFitStartTime; double fFitStartTime;
double fFitStopTime; double fFitStopTime;
unsigned int fNoOfFitBins; unsigned int fNoOfFitBins;
unsigned int GetXIndex(PRawRunData* runData);
unsigned int GetYIndex(PRawRunData* runData);
}; };
#endif // _PRUNNONMUSR_H_ #endif // _PRUNNONMUSR_H_