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

propagate fourier default settings to the application

Browse Source
This commit is contained in:
nemu 2008-12-20 13:49:19 +00:00
parent acc5d663ef
commit 2fdbe96401
4 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/classes/PMusrCanvas.cpp
View File

@ -92,8 +92,10 @@ PMusrCanvas::PMusrCanvas(const int number, const char* title,
*/
PMusrCanvas::PMusrCanvas(const int number, const char* title,
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh,
PMsrFourierStructure* fourierDefault,
const PIntVector markerList, const PIntVector colorList) :
fPlotNumber(number), fMarkerList(markerList), fColorList(colorList)
fPlotNumber(number), fFourier(fourierDefault),
fMarkerList(markerList), fColorList(colorList)
{
CreateStyle();
InitMusrCanvas(title, wtopx, wtopy, ww, wh);
@ -352,23 +354,23 @@ void PMusrCanvas::HandleMenuPopup(Int_t id)
if (id == P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_REAL) {
fPopupFourier->UnCheckEntries();
fPopupFourier->CheckEntry(id);
cout << endl << ">> will handle Real Part Fourier ..." << endl;
HandleFourier(FOURIER_PLOT_REAL);
} else if (id == P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_IMAG) {
fPopupFourier->UnCheckEntries();
fPopupFourier->CheckEntry(id);
cout << endl << ">> will handle Imaginary Part Fourier ..." << endl;
HandleFourier(FOURIER_PLOT_IMAG);
} else if (id == P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_REAL_AND_IMAG) {
fPopupFourier->UnCheckEntries();
fPopupFourier->CheckEntry(id);
cout << endl << ">> will handle Real+Imaginary Part Fourier ..." << endl;
HandleFourier(FOURIER_PLOT_REAL_AND_IMAG);
} else if (id == P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PWR) {
fPopupFourier->UnCheckEntries();
fPopupFourier->CheckEntry(id);
cout << endl << ">> will handle Power Fourier ..." << endl;
HandleFourier(FOURIER_PLOT_POWER);
} else if (id == P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE) {
fPopupFourier->UnCheckEntries();
fPopupFourier->CheckEntry(id);
cout << endl << ">> will handle Phase Fourier ..." << endl;
HandleFourier(FOURIER_PLOT_PHASE);
} else if (id == P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_PLUS) {
cout << endl << ">> will add +1° Phase to the Fourier ..." << endl;
} else if (id == P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_MINUS) {
@ -2001,7 +2003,27 @@ void PMusrCanvas::SaveDataDb()
/**
* <p>
*
* \param tag
*/
void PMusrCanvas::HandleFourier()
void PMusrCanvas::HandleFourier(int tag)
{
switch (tag) {
case FOURIER_PLOT_REAL:
cout << endl << ">> will handle Real Part Fourier ..." << endl;
break;
case FOURIER_PLOT_IMAG:
cout << endl << ">> will handle Imaginary Part Fourier ..." << endl;
break;
case FOURIER_PLOT_REAL_AND_IMAG:
cout << endl << ">> will handle Real+Imaginary Part Fourier ..." << endl;
break;
case FOURIER_PLOT_POWER:
cout << endl << ">> will handle Power Fourier ..." << endl;
break;
case FOURIER_PLOT_PHASE:
cout << endl << ">> will handle Phase Fourier ..." << endl;
break;
default:
break;
}
}

4
src/include/PMusrCanvas.h
View File

@ -149,6 +149,7 @@ class PMusrCanvas : public TObject, public TQObject
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh);
PMusrCanvas(const int number, const char* title,
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh,
PMsrFourierStructure *fourierDefault,
const PIntVector markerList, const PIntVector colorList);
virtual ~PMusrCanvas();
@ -199,6 +200,7 @@ class PMusrCanvas : public TObject, public TQObject
PMusrCanvasDataList fData;
PMusrCanvasNonMusrDataList fNonMusrData;
PMsrFourierStructure *fFourier;
PIntVector fMarkerList;
PIntVector fColorList;
@ -211,7 +213,7 @@ class PMusrCanvas : public TObject, public TQObject
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();
virtual void HandleFourier();
virtual void HandleFourier(int tag);
virtual double CalculateDiff(const double x, const double y, TH1F *theo);
virtual double CalculateDiff(const double x, const double y, TGraphErrors *theo);

2
src/include/PStartupHandler.h
View File

@ -58,7 +58,7 @@ class PStartupHandler : public TObject, public TQObject
virtual void CheckLists();
virtual const PMsrFourierStructure* GetFourierDefaults() const { return &fFourierDefaults; }
virtual PMsrFourierStructure* GetFourierDefaults() { return &fFourierDefaults; }
virtual const PStringVector GetDataPathList() const { return fDataPathList; }
virtual const PIntVector GetMarkerList() const { return fMarkerList; }
virtual const PIntVector GetColorList() const { return fColorList; }

1
src/musrview.cpp
View File

@ -229,6 +229,7 @@ cout << endl;
if (startupHandler)
musrCanvas = new PMusrCanvas(i, msrHandler->GetMsrTitle()->Data(),
10+i*100, 10+i*100, 800, 600,
startupHandler->GetFourierDefaults(),
startupHandler->GetMarkerList(),
startupHandler->GetColorList());
else