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

change color coding so that the plotNo instead of the runNo is used

Browse Source
This commit is contained in:
nemu 2008-08-20 08:20:56 +00:00
parent 9571fae953
commit d4ee3197af
3 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ToDo.txt
View File

@ -100,6 +100,8 @@ long term:
including event handler, etc.
* implement FFT with msr-interface
* switch from make to cmake
* add the possibility for cuts to db-files
* add the possibility for variable transformations to db-files
---------------------
bugs:

67
src/classes/PMusrCanvas.cpp
View File

@ -276,7 +276,7 @@ void PMusrCanvas::HandleCmdKey(Int_t event, Int_t x, Int_t y, TObject *selected)
if (x == 'q') {
Done(0);
} else if (x == 'd') {
cout << endl << ">> will show the difference between the theory and the signal, to be implemented yet. fMainCanvas name = " << fMainCanvas->GetName() << endl;
HandleDifference();
} else if (x == 'f') {
cout << endl << ">> will show the Fourier transform, to be implemented yet." << endl;
} else if (x == 'S') {
@ -466,7 +466,7 @@ cout << endl;
return;
}
// handle data
HandleDataSet(runNo, data);
HandleDataSet(i, runNo, data);
break;
case MSR_FITTYPE_ASYM:
data = fRunList->GetAsymmetry(runNo, PRunListCollection::kRunNo);
@ -478,7 +478,7 @@ cout << endl;
return;
}
// handle data
HandleDataSet(runNo, data);
HandleDataSet(i, runNo, data);
break;
case MSR_FITTYPE_ASYM_RRF:
data = fRunList->GetRRF(runNo, PRunListCollection::kRunNo);
@ -490,7 +490,7 @@ cout << endl;
return;
}
// handle data
HandleDataSet(runNo, data);
HandleDataSet(i, runNo, data);
break;
case MSR_FITTYPE_NO_MUSR:
data = fRunList->GetNonMusr(runNo, PRunListCollection::kRunNo);
@ -502,7 +502,7 @@ cout << endl;
return;
}
// handle data
HandleNonMusrDataSet(runNo, data);
HandleNonMusrDataSet(i, runNo, data);
break;
default:
fValid = false;
@ -899,7 +899,7 @@ void PMusrCanvas::CleanupDataSet(PMusrCanvasNonMusrDataSet &dataSet)
* \param runNo
* \param data
*/
void PMusrCanvas::HandleDataSet(unsigned int runNo, PRunData *data)
void PMusrCanvas::HandleDataSet(unsigned int plotNo, unsigned int runNo, PRunData *data)
{
PMusrCanvasDataSet dataSet;
TH1F *dataHisto;
@ -928,11 +928,11 @@ void PMusrCanvas::HandleDataSet(unsigned int runNo, PRunData *data)
}
// set marker and line color
if (runNo < fColorList.size()) {
dataHisto->SetMarkerColor(fColorList[runNo]);
dataHisto->SetLineColor(fColorList[runNo]);
if (plotNo < fColorList.size()) {
dataHisto->SetMarkerColor(fColorList[plotNo]);
dataHisto->SetLineColor(fColorList[plotNo]);
} else {
TRandom rand(runNo);
TRandom rand(plotNo);
Int_t color = TColor::GetColor((Int_t)rand.Integer(255), (Int_t)rand.Integer(255), (Int_t)rand.Integer(255));
dataHisto->SetMarkerColor(color);
dataHisto->SetLineColor(color);
@ -940,10 +940,10 @@ void PMusrCanvas::HandleDataSet(unsigned int runNo, PRunData *data)
// set marker size
dataHisto->SetMarkerSize(1);
// set marker type
if (runNo < fMarkerList.size()) {
dataHisto->SetMarkerStyle(fMarkerList[runNo]);
if (plotNo < fMarkerList.size()) {
dataHisto->SetMarkerStyle(fMarkerList[plotNo]);
} else {
TRandom rand(runNo);
TRandom rand(plotNo);
dataHisto->SetMarkerStyle(20+(Int_t)rand.Integer(10));
}
@ -965,10 +965,10 @@ void PMusrCanvas::HandleDataSet(unsigned int runNo, PRunData *data)
}
// set the line color
if (runNo < fColorList.size()) {
theoHisto->SetLineColor(fColorList[runNo]);
if (plotNo < fColorList.size()) {
theoHisto->SetLineColor(fColorList[plotNo]);
} else {
TRandom rand(runNo);
TRandom rand(plotNo);
Int_t color = TColor::GetColor((Int_t)rand.Integer(255), (Int_t)rand.Integer(255), (Int_t)rand.Integer(255));
theoHisto->SetLineColor(color);
}
@ -989,7 +989,7 @@ void PMusrCanvas::HandleDataSet(unsigned int runNo, PRunData *data)
* \param runNo
* \param data
*/
void PMusrCanvas::HandleNonMusrDataSet(unsigned int runNo, PRunData *data)
void PMusrCanvas::HandleNonMusrDataSet(unsigned int plotNo, unsigned int runNo, PRunData *data)
{
PMusrCanvasNonMusrDataSet dataSet;
TGraphErrors *dataHisto;
@ -1009,11 +1009,11 @@ void PMusrCanvas::HandleNonMusrDataSet(unsigned int runNo, PRunData *data)
}
// set marker and line color
if (runNo < fColorList.size()) {
dataHisto->SetMarkerColor(fColorList[runNo]);
dataHisto->SetLineColor(fColorList[runNo]);
if (plotNo < fColorList.size()) {
dataHisto->SetMarkerColor(fColorList[plotNo]);
dataHisto->SetLineColor(fColorList[plotNo]);
} else {
TRandom rand(runNo);
TRandom rand(plotNo);
Int_t color = TColor::GetColor((Int_t)rand.Integer(255), (Int_t)rand.Integer(255), (Int_t)rand.Integer(255));
dataHisto->SetMarkerColor(color);
dataHisto->SetLineColor(color);
@ -1021,10 +1021,10 @@ void PMusrCanvas::HandleNonMusrDataSet(unsigned int runNo, PRunData *data)
// set marker size
dataHisto->SetMarkerSize(1);
// set marker type
if (runNo < fMarkerList.size()) {
dataHisto->SetMarkerStyle(fMarkerList[runNo]);
if (plotNo < fMarkerList.size()) {
dataHisto->SetMarkerStyle(fMarkerList[plotNo]);
} else {
TRandom rand(runNo);
TRandom rand(plotNo);
dataHisto->SetMarkerStyle(20+(Int_t)rand.Integer(10));
}
@ -1040,10 +1040,10 @@ void PMusrCanvas::HandleNonMusrDataSet(unsigned int runNo, PRunData *data)
}
// set the line color
if (runNo < fColorList.size()) {
theoHisto->SetLineColor(fColorList[runNo]);
if (plotNo < fColorList.size()) {
theoHisto->SetLineColor(fColorList[plotNo]);
} else {
TRandom rand(runNo);
TRandom rand(plotNo);
Int_t color = TColor::GetColor((Int_t)rand.Integer(255), (Int_t)rand.Integer(255), (Int_t)rand.Integer(255));
theoHisto->SetLineColor(color);
}
@ -1054,3 +1054,16 @@ void PMusrCanvas::HandleNonMusrDataSet(unsigned int runNo, PRunData *data)
fNonMusrData.push_back(dataSet);
}
//--------------------------------------------------------------------------
// HandleDifference
//--------------------------------------------------------------------------
/**
* <p>
*
*/
void PMusrCanvas::HandleDifference()
{
cout << endl << ">> will show the difference between the theory and the signal, to be implemented yet. fMainCanvas name = " << fMainCanvas->GetName();
cout << endl;
}

5
src/include/PMusrCanvas.h
View File

@ -168,8 +168,9 @@ class PMusrCanvas : public TObject, public TQObject
virtual void InitDataSet(PMusrCanvasNonMusrDataSet &dataSet);
virtual void CleanupDataSet(PMusrCanvasDataSet &dataSet);
virtual void CleanupDataSet(PMusrCanvasNonMusrDataSet &dataSet);
virtual void HandleDataSet(unsigned int runNo, PRunData *data);
virtual void HandleNonMusrDataSet(unsigned int runNo, PRunData *data);
virtual void HandleDataSet(unsigned int plotNo, unsigned int runNo, PRunData *data);
virtual void HandleNonMusrDataSet(unsigned int plotNo, unsigned int runNo, PRunData *data);
virtual void HandleDifference();
ClassDef(PMusrCanvas, 1)
};