Index: /trunk/MagicSoft/Cosy/candrv/nodedrv.cc =================================================================== --- /trunk/MagicSoft/Cosy/candrv/nodedrv.cc (revision 8822) +++ /trunk/MagicSoft/Cosy/candrv/nodedrv.cc (revision 8823) @@ -484,5 +484,5 @@ // least one Nodeguard message was answered. // -class NodeGuard : public MThread +class NodeGuard : public MyThreadX { Double_t fTimeoutTime; //[s] @@ -496,5 +496,5 @@ public: NodeGuard(NodeDrv *drv, Int_t guard, Int_t ltf, Bool_t canopen) - : MThread(false), fGuardTime(guard/1000.), fLifeTimeFactor(ltf), fIsCanOpen(canopen), fDrv(drv) { } + : MyThreadX("NodeGuard"), fGuardTime(guard/1000.), fLifeTimeFactor(ltf), fIsCanOpen(canopen), fDrv(drv) { } void Reset(const timeval_t *tv=NULL) @@ -509,9 +509,9 @@ } - void *Thread() + Int_t Thread() { Reset(); - while (!HasStopFlag()) + while (!IsThreadCanceled()) { // Sending nodeguards seems to result in @@ -527,7 +527,7 @@ const Double_t t0 = t+fGuardTime; - while (!HasStopFlag() && (double)tStart(); + fGuard->RunThread(); lout << "- " << GetNodeName() << ": Guarding (" << dec; Index: /trunk/MagicSoft/Cosy/telesto.cc =================================================================== --- /trunk/MagicSoft/Cosy/telesto.cc (revision 8823) +++ /trunk/MagicSoft/Cosy/telesto.cc (revision 8823) @@ -0,0 +1,171 @@ +#include +#include +#include +#include +#include +#include + +#include "MAGIC.h" + +#include "MLog.h" +#include "MLogManip.h" + +//#include "MEnv.h" +#include "MArgs.h" +#include "MArray.h" +#include "MParContainer.h" +//#include "MDirIter.h" + +#include "TPointGui.h" +//#include "MStatusDisplay.h" + +//#include "MSequence.h" +//#include "MJStar.h" + +using namespace std; + +static void StartUpMessage() +{ + gLog << all << endl; + + // 1 2 3 4 5 6 + // 123456789012345678901234567890123456789012345678901234567890 + gLog << "========================================================" << endl; + gLog << " Telesto - COSY" << endl; + gLog << " Telesto - Telescope TPoint organizer" << endl; + gLog << " Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl; + gLog << "========================================================" << endl; + gLog << endl; +} + +static void Usage() +{ + // 1 2 3 4 5 6 7 8 + // 12345678901234567890123456789012345678901234567890123456789012345678901234567890 + gLog << all << endl; + gLog << "Sorry the usage is:" << endl; + gLog << " telestop [file.txt|file.col]" << endl << endl; + gLog << " Arguments:" << endl; + gLog << " n/a" << endl; + gLog << " For more details see MSequence" << endl; + gLog << " Root Options:" << endl; + gLog << " -b Batch mode (no graphical output to screen)" << endl<" << endl; +// gLog << " --debug-env[=1] Display untouched resources after program execution" << endl; +// gLog << " --debug-env=2 Display untouched resources after eventloop setup" << endl; +// gLog << " --debug-env=3 Debug setting resources from resource file and command line" << endl; + gLog << " --debug-mem Debug memory usage" << endl << endl; +// gLog << " --rc=Name:option Set or overwrite a resource of the resource file." << endl; + gLog << " (Note, that this option can be used multiple times." << endl; + gLog << endl; +// gLog << " Input Options:" << endl; +// gLog << " -mc You must use this for MC files (PRELIMINARY)" << endl << endl; + gLog << " Output options:" << endl; +// gLog << " -q Quit when job is finished" << endl; +// gLog << " -f Force overwrite of existing files" << endl; +// gLog << " -ff Force execution if not all files found" << endl; +// gLog << " --ind=path Path where to search for the calibrated data (Y)" << endl; +// gLog << " [default=standard path in datacenter]" << endl; +// gLog << " --out=path Path to write the all results to [def=local path]" << endl; +// gLog << " (overwrites --outc and --outy)" << endl; +// gLog << " --no-muons Switch off Muon analysis (for fast tests)" << endl; +// gLog << " --print-seq Print Sequence information" << endl; +// gLog << " --print-files Print Files taken from Sequence" << endl; +// gLog << " --print-found Print Files found from Sequence" << endl; +// gLog << " --config=star.rc Resource file [default=star.rc]" << endl; + gLog << endl; + gLog << " --version, -V Show startup message with version number" << endl; + gLog << " -?, -h, --help This help" << endl << endl; + gLog << "Background:" << endl; + gLog << " Telesto is a moon of Saturn. It was discovered by Smith, Reitsema," << endl; + gLog << " Larson and Fountain in 1980 from ground-based observations, and was" << endl; + gLog << " provisionally designated S/1980 S 13." << endl; + gLog << " In 1983 it was officially named after Telesto of Greek mythology. It" << endl; + gLog << " is also designated as Saturn XIII or Tethys B." << endl; + gLog << " Telesto is co-orbital with Tethys, residing in Tethys' leading" << endl; + gLog << " Lagrangian point (L4). This relationship was first identified by" << endl; + gLog << " Seidelmann et al. The moon Calypso also resides in the other" << endl; + gLog << " (trailing) lagrangian point of Tethys, 60 deg in the other direction." << endl; + gLog << " The Cassini probe performed a distant flyby of Telesto on Oct. 11," << endl; + gLog << " 2005. The resulting images show that its surface is surprisingly" << endl; + gLog << " smooth, devoid of small impact craters." << endl << endl; +} + +int main(int argc, char **argv) +{ + if (!MARS::CheckRootVer()) + return 0xff; + + MLog::RedirectErrorHandler(MLog::kColor); + + // + // Evaluate arguments + // + MArgs arg(argc, argv, kTRUE); + gLog.Setup(arg); + + StartUpMessage(); + + if (arg.HasOnly("-V") || arg.HasOnly("--version")) + return 0; + + if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help")) + { + Usage(); + return 2; + } + + const Bool_t kDebugMem = arg.HasOnlyAndRemove("--debug-mem"); + + // + // check for the right usage of the program (number of arguments) + // + if (arg.GetNumArguments()>1) + { + gLog << warn << "WARNING - Wrong number of arguments..." << endl; + Usage(); + return 2; + } + + TString fname=arg.GetArgumentStr(0); + + // + // check for the right usage of the program (number of options) + // + if (arg.GetNumOptions()>0) + { + gLog << warn << "WARNING - Unknown commandline options..." << endl; + arg.Print("options"); + gLog << endl; + return 2; + } + +// MArray::Class()->IgnoreTObjectStreamer(); +// MParContainer::Class()->IgnoreTObjectStreamer(); + + TApplication app("telesto", &argc, argv); + if (!gClient || gROOT->IsBatch()) + { + gLog << err << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl; + return 1; + } + + if (kDebugMem) + TObject::SetObjectStat(kTRUE); + + TPointGui *gui = new TPointGui(fname.IsNull()?0:(const char*)fname); + gui->SetExitLoopOnClose(); + + // Wait until the user decides to exit the application + app.Run(kFALSE); + + if (TObject::GetObjectStat()) + { + TObject::SetObjectStat(kFALSE); + gObjectTable->Print(); + } + + return 0; +} Index: /trunk/MagicSoft/Cosy/tpoint/Makefile =================================================================== --- /trunk/MagicSoft/Cosy/tpoint/Makefile (revision 8823) +++ /trunk/MagicSoft/Cosy/tpoint/Makefile (revision 8823) @@ -0,0 +1,27 @@ +################################################################## +# +# makefile +# +# for the MARS software +# +################################################################## + +include ../Makefile.conf.$(OSTYPE) +include ../Makefile.conf.general + +INCLUDES = -I. -I.. -I../mars -I../base + +CINT = TPoint + +#------------------------------------------------------------------------------ + +SRCFILES = TPointStar.cc \ + TPointGui.cc + +############################################################ + +all: $(OBJS) + +include ../Makefile.rules + +mrproper: clean rmbak Index: /trunk/MagicSoft/Cosy/tpoint/TPointGui.cc =================================================================== --- /trunk/MagicSoft/Cosy/tpoint/TPointGui.cc (revision 8823) +++ /trunk/MagicSoft/Cosy/tpoint/TPointGui.cc (revision 8823) @@ -0,0 +1,1182 @@ +#include "TPointGui.h" + +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "MLog.h" +#include "MLogManip.h" + +#include "MGList.h" + +#include "TPointStar.h" + +ClassImp(TPointGui); + +using namespace std; + +TPointGui::TPointGui(const char *fname) : TGMainFrame(gClient->GetRoot(), 750, 435, kHorizontalFrame), fExitLoopOnClose(kFALSE) +{ + fCoordinates.SetOwner(); + fOriginal.SetOwner(); + + fList = new MGList; + fList->SetOwner(); + + fFont = gVirtualX->LoadQueryFont("7x13bold"); + + TGLayoutHints *hints0 = new TGLayoutHints(kLHintsExpandY, 7, 5, 5, 0); + TGLayoutHints *hints1 = new TGLayoutHints(kLHintsExpandX|kLHintsExpandY, 5, 7, 5, 6); + fList->Add(hints0); + fList->Add(hints1); + + TGGroupFrame *grp1 = new TGGroupFrame(this, "Control", kVerticalFrame); + AddFrame(grp1, hints0); + fList->Add(grp1); + + TGGroupFrame *grp2 = new TGGroupFrame(this, "Parameters", kHorizontalFrame); + AddFrame(grp2, hints1); + fList->Add(grp2); + + TGLayoutHints *hints4 = new TGLayoutHints(kLHintsExpandX, 5, 5, 3); + TGLayoutHints *hints5 = new TGLayoutHints(kLHintsExpandX, 5, 5, 10); + AddTextButton(grp1, "Load Pointing Model", kTbLoad, hints5); + AddTextButton(grp1, "Save Pointing Model", kTbSave, hints4); + AddTextButton(grp1, "Fit Parameters", kTbFit, hints5); + AddTextButton(grp1, "Reset Parameters", kTbReset, hints4); + AddTextButton(grp1, "Load Stars", kTbLoadStars, hints5); + AddTextButton(grp1, "Reset Stars", kTbResetStars, hints4); + AddTextButton(grp1, "Reload Stars", kTbReloadStars, hints4); + fList->Add(hints4); + fList->Add(hints5); + + + TGHorizontalFrame *comp = new TGHorizontalFrame(grp2, 1, 1); + grp2->AddFrame(comp); + fList->Add(comp); + + TGLayoutHints *hints3 = new TGLayoutHints(kLHintsLeft|kLHintsTop, 0, 10, 5, 0); + fList->Add(hints3); + + TGVerticalFrame *vframe = new TGVerticalFrame(comp, 1, 1); + + for (int i=0; iFindWidget(0); + + comp->AddFrame(vframe, hints3); + fList->Add(vframe); + + vframe = new TGVerticalFrame(comp, 1, 1); + comp->AddFrame(vframe, hints3); + fList->Add(vframe); + + hints3 = new TGLayoutHints(kLHintsLeft|kLHintsTop, 0, 10, 5, 0); + fList->Add(hints3); + + TGLabel *l = new TGLabel(vframe, "+000.0000"); + l->SetTextJustify(kTextRight); + fList->Add(l); + fLabel.Add(l); + + TGLayoutHints *h = new TGLayoutHints(kLHintsCenterY, 0, 0, but->GetHeight()-l->GetHeight()); + fList->Add(h); + + vframe->AddFrame(l,h); + + for (int i=1; iSetTextJustify(kTextRight); + + vframe = new TGVerticalFrame(comp, 1, 1); + comp->AddFrame(vframe, hints3); + fList->Add(vframe); + + for (int i=0; iSetTextJustify(kTextRight); + + hints3 = new TGLayoutHints(kLHintsLeft|kLHintsTop, 0, 20, 5, 0); + fList->Add(hints3); + + TGLayoutHints *hreset = new TGLayoutHints(kLHintsLeft|kLHintsTop, 0, 0, 3, 1); + fList->Add(hreset); + + TGVerticalFrame *vframe2 = new TGVerticalFrame(comp, 1, 1); + comp->AddFrame(vframe2, hints3); + fList->Add(vframe2); + for (int i=0; iGetHeight()-4); + + vframe = new TGVerticalFrame(comp, 1, 1); + comp->AddFrame(vframe, hints3); + fList->Add(vframe); + + for (int i=0; iAddFrame(l, hints5); + fList->Add(l); + fLabel.Add(l); + + l = new TGLabel(grp1, ""); + l->SetTextJustify(kTextLeft); + grp1->AddFrame(l, hints5); + fList->Add(l); + fLabel.Add(l); + + l = new TGLabel(grp1, ""); + l->SetTextJustify(kTextLeft); + grp1->AddFrame(l, hints5); + fList->Add(l); + fLabel.Add(l); + + l = new TGLabel(grp1, ""); + l->SetTextJustify(kTextLeft); + grp1->AddFrame(l, hints5); + fList->Add(l); + fLabel.Add(l); + + // FIXME: Move this to the rc-file. + ((TGCheckButton*)fList->FindWidget(0))->SetState(kButtonDown); + ((TGCheckButton*)fList->FindWidget(1))->SetState(kButtonDown); + ((TGCheckButton*)fList->FindWidget(6))->SetState(kButtonDown); + ((TGCheckButton*)fList->FindWidget(10))->SetState(kButtonDown); + ((TGCheckButton*)fList->FindWidget(12))->SetState(kButtonDown); + ((TGCheckButton*)fList->FindWidget(17))->SetState(kButtonDown); + + ((TGCheckButton*)fList->FindWidget(19))->SetState(kButtonDisabled); + ((TGCheckButton*)fList->FindWidget(20))->SetState(kButtonDisabled); + ((TGCheckButton*)fList->FindWidget(21))->SetState(kButtonDisabled); + ((TGCheckButton*)fList->FindWidget(22))->SetState(kButtonDisabled); + + ((TGCheckButton*)fList->FindWidget(19+2*MPointing::GetNumPar()))->SetState(kButtonDisabled); + ((TGCheckButton*)fList->FindWidget(20+2*MPointing::GetNumPar()))->SetState(kButtonDisabled); + ((TGCheckButton*)fList->FindWidget(21+2*MPointing::GetNumPar()))->SetState(kButtonDisabled); + ((TGCheckButton*)fList->FindWidget(22+2*MPointing::GetNumPar()))->SetState(kButtonDisabled); + + SetWindowName("TPoint Fitting Window"); + SetIconName("TPoint++"); + + Layout(); + + MapSubwindows(); + MapWindow(); + + if (fname) + LoadStars(fname); + + DisplayBending(); + DisplayData(); +} + +TPointGui::~TPointGui() +{ + if (fFont) + gVirtualX->DeleteFont(fFont); + + delete fList; + + if (fExitLoopOnClose) + gSystem->ExitLoop(); +} + +void TPointGui::Fcn(Int_t &/*npar*/, Double_t */*gin*/, Double_t &f, Double_t *par, Int_t /*iflag*/) +{ + f = 0; + + MPointing bend; + bend.SetParameters(par); // Set Parameters [deg] to MPointing + + for (int i=0; iGetObjectFit())->Fcn(npar, gin, f, par, iflag); +} + +void TPointGui::AddTextButton(TGCompositeFrame *f, TString txt, Int_t id, TGLayoutHints *h) +{ + TGButton *but = new TGTextButton(f, txt, id); + but->Associate(this); + f->AddFrame(but, h); + fList->Add(but); + +} + +void TPointGui::AddCheckButton(TGCompositeFrame *f, TString txt, Int_t id, TGLayoutHints *h) +{ + TGButton *but = new TGCheckButton(f, txt, id); + but->Associate(this); + f->AddFrame(but, h); + fList->Add(but); +} + +void TPointGui::AddResetButton(TGCompositeFrame *f, Int_t id, TGLayoutHints *h, Int_t height) +{ + TGPictureButton *but = new TGPictureButton(f, "tpoint/skull.xpm", id); + but->SetHeight(height); // Offsets from TGLayout + but->SetWidth(height); + but->Associate(this); + f->AddFrame(but, h); + fList->Add(but); +} + +TGLabel *TPointGui::AddLabel(TGCompositeFrame *f, TString txt, TGLayoutHints *h) +{ + TGLabel *l = new TGLabel(f, txt/*, TGLabel::GetDefaultGC()(), fFont*/); + f->AddFrame(l, h); + fList->Add(l); + fLabel.Add(l); + return l; +} + +void TPointGui::DisplayBending() +{ + TArrayD par, err; + fBending.GetParameters(par); + fBending.GetError(err); + + TGLabel *l; + + for (int i=0; iSetText(Form("%.4f\xb0", par[i])); + + l = (TGLabel*)fLabel.At(MPointing::GetNumPar()+i); + l->SetText(Form("\xb1 %8.4f\xb0", err[i]>0?err[i]:0)); + } +} + +void TPointGui::DisplayData() +{ + TGLabel *l = (TGLabel*)fLabel.At(3*MPointing::GetNumPar()); + l->SetText(Form("%d data sets loaded.", fOriginal.GetSize())); +} + +void TPointGui::DisplayResult(Double_t before, Double_t after, Double_t backw) +{ + TGLabel *l1 = (TGLabel*)fLabel.At(3*MPointing::GetNumPar()+1); + l1->SetText(Form("Before: %.1f +- %.1f SE", before, 0.)); + + TGLabel *l2 = (TGLabel*)fLabel.At(3*MPointing::GetNumPar()+2); + l2->SetText(Form("After: %.1f +- %.1f SE", after, 0.)); + + TGLabel *l3 = (TGLabel*)fLabel.At(3*MPointing::GetNumPar()+3); + l3->SetText(Form("Backw: %.1f +- %.1f SE", backw, 0.)); +} + +void TPointGui::DrawMarker(TVirtualPad *pad, Double_t r0, Double_t phi0) +{ + TView *view = pad->GetView(); + + if (!view) + { + gLog << err << "No View!" << endl; + return; + } + + TMarker mark0; + mark0.SetMarkerStyle(kFullDotLarge); + mark0.SetMarkerColor(kBlue); + + r0 /= 90; + phi0 *= TMath::DegToRad(); + + Double_t x[6] = { r0*cos(phi0), r0*sin(phi0), 0, 0, 0, 0}; + + view->WCtoNDC(x, x+3); + + mark0.DrawMarker(-x[3], x[4]); +} + +void TPointGui::DrawPolLine(TVirtualPad *pad, Double_t r0, Double_t phi0, Double_t r1, Double_t phi1) +{ + TView *view = pad->GetView(); + + if (!view) + { + gLog << err << "No View!" << endl; + return; + } + /* + if (r0<0) + { + r0 = -r0; + phi0 += 180; + } + if (r1<0) + { + r1 = -r1; + phi1 += 180; + } + + phi0 = fmod(phi0+360, 360); + phi1 = fmod(phi1+360, 360); + + if (phi1-phi0<-180) + phi1+=360; + */ + TLine line; + line.SetLineWidth(2); + line.SetLineColor(kBlue); + + Double_t p0 = phi0phi1) + { + Double_t d = r1; + r1 = r0; + r0 = d; + } + + r0 /= 90; + r1 /= 90; + + Double_t dr = r1-r0; + Double_t dp = p1-p0; + + Double_t x0[3] = { r0*cos(p0*TMath::DegToRad()), r0*sin(p0*TMath::DegToRad()), 0}; + + for (double i=p0+10; ip1) + i=p1; + + Double_t r = dr/dp*(i-p0)+r0; + Double_t p = TMath::DegToRad()*i; + + Double_t x1[3] = { r*cos(p), r*sin(p), 0}; + + Double_t y0[3], y1[3]; + + view->WCtoNDC(x0, y0); + view->WCtoNDC(x1, y1); + + line.DrawLine(y0[0], y0[1], y1[0], y1[1]); + + x0[0] = x1[0]; + x0[1] = x1[1]; + } +} + +void TPointGui::DrawSet(TVirtualPad *pad, TPointStar &set, Float_t scale, Float_t angle) +{ + Double_t r0 = set.GetRawZd(); + Double_t phi0 = set.GetRawAz()-angle; + Double_t r1 = set.GetStarZd(); + Double_t phi1 = set.GetStarAz()-angle; + + if (r0<0) + { + r0 = -r0; + phi0 += 180; + } + if (r1<0) + { + r1 = -r1; + phi1 += 180; + } + + phi0 = fmod(phi0+360, 360); + phi1 = fmod(phi1+360, 360); + + if (phi1-phi0<-180) + phi1+=360; + + if (scale<0 || scale>1000) + scale = -1; + + if (scale>0) + { + Double_t d = r1-r0; + r0 += scale*d; + r1 -= scale*d; + d = phi1-phi0; + phi0 += scale*d; + phi1 -= scale*d; + + DrawPolLine(pad, r0, phi0, r1, phi1); + DrawMarker(pad, r0, phi0); + } + else + DrawMarker(pad, r1, phi1); +} + +void TPointGui::DrawHorizon(TVirtualPad *pad, const char *fname) const +{ + TView *view = pad->GetView(); + + if (!view) + { + gLog << err << "No View!" << endl; + return; + } + + ifstream fin(fname); + if (!fin) + { + gLog << err << "ERROR - " << fname << " not found." << endl; + return; + } + + TPolyLine poly; + poly.SetLineWidth(2); + poly.SetLineColor(12); + poly.SetLineStyle(8); + + while (1) + { + TString line; + line.ReadLine(fin); + if (!fin) + break; + + Float_t az, alt; + sscanf(line.Data(), "%f %f", &az, &alt); + + Float_t zd = 90-alt; + + az *= TMath::DegToRad(); + zd /= 90; + + Double_t x[6] = { zd*cos(az), zd*sin(az), 0, 0, 0, 0}; + view->WCtoNDC(x, x+3); + poly.SetNextPoint(-x[3], x[4]); + } + + poly.DrawClone()->SetBit(kCanDelete); + +} + +TString TPointGui::OpenDialog(EFileDialogMode mode) +{ + static const char *gOpenTypes[] = + { + "TPoint files", "*.txt", + "Collection files", "*.col", + "All files", "*", + NULL, NULL + }; + + static TString dir("tpoint/"); + + TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo + + fi.fFileTypes = (const char**)gOpenTypes; + fi.fIniDir = StrDup(dir); + + new TGFileDialog(fClient->GetRoot(), this, mode, &fi); + + if (!fi.fFilename) + return 0; + + dir = fi.fIniDir; + + return fi.fFilename; +} + +void TPointGui::LoadCollection(TString fname) +{ + ifstream fin(fname); + if (!fin) + { + gLog << err << "Collection '" << fname << "' not found!" << endl; + return; + } + + while (1) + { + TString line; + line.ReadLine(fin); + if (!fin) + break; + + line = line.Strip(TString::kBoth); + if (line[0]=='#') + continue; + if (line.Length()==0) + continue; + + if (!line.EndsWith(".txt")) + { + gLog << warn << "WARNING: " << line << endl; + continue; + } + + LoadStars(line); + } +} + +void TPointGui::LoadStars(TString fname) +{ + if (fname.EndsWith(".col")) + { + LoadCollection(fname); + fFileNameStars = fname; + return; + } + + const Int_t size = fOriginal.GetSize(); + + ifstream fin(fname); + + while (fin && fin.get()!='\n'); + while (fin && fin.get()!='\n'); + while (fin && fin.get()!='\n'); + if (!fin) + { + gLog << err << "File '" << fname << "' not found!" << endl; + return; + } + + while (1) + { + TPointStar set; + + fin >> set; // Read data from file [deg], it is stored in [rad] + if (!fin) + break; + + fOriginal.Add(new TPointStar(set)); + } + + gLog << all << "Found " << fOriginal.GetSize()-size; + gLog << " sets of coordinates in " << fname; + gLog << " (Total=" << fOriginal.GetSize() << ")" << endl; + + fFileNameStars = fname; +} + +Bool_t TPointGui::ProcessMessage(Long_t msg, Long_t mp1, Long_t) +{ + // cout << "Msg: " << hex << GET_MSG(msg) << endl; + // cout << "SubMsg: " << hex << GET_SUBMSG(msg) << dec << endl; + switch (GET_MSG(msg)) + { + case kC_COMMAND: + switch (GET_SUBMSG(msg)) + { + case kCM_BUTTON: + switch (mp1) + { + case kTbFit: + { + Double_t before=0; + Double_t after=0; + Double_t backw=0; + Fit(before, after, backw); + DisplayBending(); + DisplayResult(before, after, backw); + } + return kTRUE; + case kTbLoad: + fBending.Load(OpenDialog()); + DisplayBending(); + return kTRUE; + case kTbSave: + fBending.Save(OpenDialog(kFDSave)); + return kTRUE; + case kTbLoadStars: + LoadStars(OpenDialog()); + DisplayData(); + return kTRUE; + case kTbReset: + fBending.Reset(); + DisplayBending(); + return kTRUE; + case kTbReloadStars: + fOriginal.Delete(); + LoadStars(fFileNameStars); // FIXME: Use TGLabel! + DisplayData(); + return kTRUE; + case kTbResetStars: + fOriginal.Delete(); + DisplayData(); + return kTRUE; + } + + // In the default cas a reset button must have been pressed + fBending[mp1-2*MPointing::GetNumPar()] = 0; + DisplayBending(); + return kTRUE; + } + return kTRUE; + } + return kTRUE; +} + +void TPointGui::Fit(Double_t &before, Double_t &after, Double_t &backw) +{ + if (fOriginal.GetSize()==0) + { + gLog << warn << "Sorry, no input data loaded..." << endl; + return; + } + + fCoordinates.Delete(); + for (int i=0; iSetOptStat("emro"); + + TH1F hres1("Res1", " Residuals before correction ", fOriginal.GetSize()/3, 0, 0.3); + TH1F hres2("Res2", " Residuals after correction ", fOriginal.GetSize()/3, 0, 0.3); + TH1F hres3("Res3", " Residuals after backward correction ", fOriginal.GetSize()/3, 0, 0.3); + + TProfile proaz ("ProAz", " \\Delta profile vs. Az", 48, -180, 180); + TProfile prozd ("ProZd", " \\Delta profile vs. Zd", 60, 0, 90); + TProfile promag("ProMag", " \\Delta profile vs. Mag", 40, 1, 4); + + hres1.SetXTitle("\\Delta [\\circ]"); + hres1.SetYTitle("Counts"); + + hres2.SetXTitle("\\Delta [\\circ]"); + hres2.SetYTitle("Counts"); + + hres3.SetXTitle("\\Delta [\\circ]"); + hres3.SetYTitle("Counts"); + + TGraph gdaz; + TGraph gdzd; + TGraph gaz; + TGraph gzd; + TGraphErrors graz; + TGraphErrors grzd; + TGraphErrors grmag; + TGraph gmaz; + TGraph gmzd; + + gdaz.SetTitle(" \\Delta Az vs. Zd "); + gdzd.SetTitle(" \\Delta Zd vs. Az "); + + gaz.SetTitle(" \\Delta Az vs. Az "); + gzd.SetTitle(" \\Delta Zd vs. Zd "); + + gmaz.SetTitle(" \\Delta Az vs. Mag "); + gmzd.SetTitle(" \\Delta Zd vs. Mag "); + + graz.SetTitle(" \\Delta vs. Az "); + grzd.SetTitle(" \\Delta vs. Zd "); + grmag.SetTitle(" \\Delta vs. Mag "); + + TMinuit minuit(MPointing::GetNumPar()); //initialize TMinuit with a maximum of 5 params + minuit.SetObjectFit(this); + minuit.SetPrintLevel(-1); + minuit.SetFCN(fcn); + + fBending.SetMinuitParameters(minuit, MPointing::GetNumPar()); // Init Parameters [deg] + + for (int i=0; iFindWidget(i); + minuit.FixParameter(i); + if (l->GetState()==kButtonDown) + minuit.Release(i); + } + + //minuit.Command("SHOW PARAMETERS"); + //minuit.Command("SHOW LIMITS"); + + gLog << inf << endl; + gLog << "Starting fit..." << endl; + gLog << "For the fit an measurement error in the residual of "; + gLog << "0.02deg (=1SE) is assumed." << endl; + gLog << endl; + + Int_t ierflg = 0; + ierflg = minuit.Migrad(); + gLog << inf << "Migrad returns " << ierflg << endl; + // minuit.Release(2); + ierflg = minuit.Migrad(); + gLog << inf << "Migrad returns " << ierflg << endl << endl; + + // + // Get Fit Results + // + fBending.GetMinuitParameters(minuit); + fBending.PrintMinuitParameters(minuit); + gLog << endl; + //fBending.Save("bending_magic.txt"); + + + // + // Make a copy of all list entries + // + TList list; + list.SetOwner(); + for (int i=0; i180) + dz -= 360; + + Double_t err; + Double_t resi = set0.GetResidual(&err); + + gdzd.SetPoint(i, za.Az(), set0.GetDZd()); + gdaz.SetPoint(i, za.Zd(), dz); + graz.SetPoint(i, za.Az(), resi); + graz.SetPointError(i, 0, err); + grzd.SetPoint(i, za.Zd(), resi); + grzd.SetPointError(i, 0, err); + + if (resi>0.13)//orig.GetStarAz()>0 && orig.GetStarAz()<50 && set0.GetDZd()<-0.032 && orig.GetStarEl()<80) // 0.13 + gLog << inf << " " << orig << " <" << resi << ">" << endl; + + proaz.Fill(za.Az(), set0.GetResidual(&err)); + prozd.Fill(za.Zd(), set0.GetResidual(&err)); + promag.Fill(set0.GetMag(), set0.GetResidual(&err)); + + gaz.SetPoint( i, za.Az(), dz); + gzd.SetPoint( i, za.Zd(), set0.GetDZd()); + if (set0.GetMag()>=-20) + { + grmag.SetPoint(i, set0.GetMag(), set0.GetResidual(&err)); + grmag.SetPointError(i, 0, err); + gmaz.SetPoint( i, set0.GetMag(), dz); + gmzd.SetPoint( i, set0.GetMag(), set0.GetDZd()); + } + } + + // + // Check for overflows + // + const Stat_t ov = hres2.GetBinContent(hres2.GetNbinsX()+1); + if (ov>0) + gLog << warn << "WARNING: " << ov << " overflows in residuals." << endl; + + + + gLog << inf << dec << endl; + gLog << " Number of calls to FCN: " << minuit.fNfcn << endl; + gLog << "Minimum value found for FCN (Chi^2?): " << minuit.fAmin << endl; + gLog << " Fit-Probability(?): " << TMath::Prob(minuit.fAmin/*fOriginal.GetSize()*/, fOriginal.GetSize()-minuit.GetNumFreePars())*100 << "%" << endl; + gLog << " Chi^2/NDF: " << minuit.fAmin/(fOriginal.GetSize()-minuit.GetNumFreePars()) << endl; + //cout << "Prob(?): " << TMath::Prob(fChisquare,ndf); + + + + // + // Print all data sets for which the backward correction is + // twice times worse than the residual gotten from the + // bending correction itself + // + gLog << endl; + gLog << "Checking backward correction (raw-->star):" << endl; + for (int i=0; iGetMaximum(), gdaz.GetHistogram()->GetMaximum()); + const Double_t max2 = TMath::Max(gzd.GetHistogram()->GetMaximum(), gdzd.GetHistogram()->GetMaximum()); + const Double_t max3 = TMath::Max(grzd.GetHistogram()->GetMaximum(), graz.GetHistogram()->GetMaximum()); + + const Double_t min1 = TMath::Min(gaz.GetHistogram()->GetMinimum(), gdaz.GetHistogram()->GetMinimum()); + const Double_t min2 = TMath::Min(gzd.GetHistogram()->GetMinimum(), gdzd.GetHistogram()->GetMinimum()); + const Double_t min3 = TMath::Min(grzd.GetHistogram()->GetMinimum(), graz.GetHistogram()->GetMinimum()); + + const Double_t absmax1 = TMath::Max(max1, TMath::Abs(min1)); + const Double_t absmax2 = TMath::Max(max2, TMath::Abs(min2)); + const Double_t absmax3 = TMath::Max(max3, TMath::Abs(min3)); + + gaz.SetMaximum(absmax1); + gzd.SetMaximum(absmax2); + gdaz.SetMaximum(absmax1); + gdzd.SetMaximum(absmax2); + gmaz.SetMaximum(absmax1); + gmzd.SetMaximum(absmax2); + graz.SetMaximum(absmax3); + grzd.SetMaximum(absmax3); + grmag.SetMaximum(absmax3); + gaz.SetMinimum(-absmax1); + gzd.SetMinimum(-absmax2); + gdaz.SetMinimum(-absmax1); + gdzd.SetMinimum(-absmax2); + gmaz.SetMinimum(-absmax1); + gmzd.SetMinimum(-absmax2); + graz.SetMinimum(0); + grzd.SetMinimum(0); + grmag.SetMinimum(0); + + TCanvas *c1; + + if (gROOT->FindObject("CanvGraphs")) + c1 = dynamic_cast(gROOT->FindObject("CanvGraphs")); + else + c1=new TCanvas("CanvGraphs", "Graphs"); + + gROOT->SetSelectedPad(0); + c1->SetSelectedPad(0); + c1->SetBorderMode(0); + c1->SetFrameBorderMode(0); + c1->Clear(); + + c1->SetFillColor(kWhite); +#ifndef PRESENTATION + c1->Divide(3,3,1e-10,1e-10); +#else + c1->Divide(2,2,1e-10,1e-10); +#endif + c1->SetFillColor(kWhite); + + TGraph *g=0; + + TLine line; + line.SetLineColor(kGreen); + line.SetLineWidth(2); +#ifndef PRESENTATION + c1->cd(1); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + g=(TGraph*)gaz.DrawClone("A*"); + g->SetBit(kCanDelete); + g->GetHistogram()->SetXTitle("Az [\\circ]"); + g->GetHistogram()->SetYTitle("\\Delta Az [\\circ]"); + + line.DrawLine(g->GetXaxis()->GetXmin(), 360./16384, g->GetXaxis()->GetXmax(), 360./16384); + line.DrawLine(g->GetXaxis()->GetXmin(), -360./16384, g->GetXaxis()->GetXmax(), -360./16384); + + c1->cd(2); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + g=(TGraph*)gdaz.DrawClone("A*"); + g->SetBit(kCanDelete); + g->GetHistogram()->SetXTitle("Zd [\\circ]"); + g->GetHistogram()->SetYTitle("\\Delta Az [\\circ]"); + line.DrawLine(g->GetXaxis()->GetXmin(), 360./16384, g->GetXaxis()->GetXmax(), 360./16384); + line.DrawLine(g->GetXaxis()->GetXmin(), -360./16384, g->GetXaxis()->GetXmax(), -360./16384); + cout << "Mean dAz: " << g->GetMean(2) << " \xb1 " << g->GetRMS(2) << endl; + + c1->cd(3); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + if (gmaz.GetN()>0) + { + g=(TGraph*)gmaz.DrawClone("A*"); + g->SetBit(kCanDelete); + g->GetHistogram()->SetXTitle("Mag"); + g->GetHistogram()->SetYTitle("\\Delta Az [\\circ]"); + line.DrawLine(g->GetXaxis()->GetXmin(), 360./16384, g->GetXaxis()->GetXmax(), 360./16384); + line.DrawLine(g->GetXaxis()->GetXmin(), -360./16384, g->GetXaxis()->GetXmax(), -360./16384); + } +#endif + +#ifndef PRESENTATION + c1->cd(4); +#else + c1->cd(1); +#endif + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + g=(TGraph*)gdzd.DrawClone("A*"); + g->SetBit(kCanDelete); + g->GetHistogram()->SetXTitle("Az [\\circ]"); + g->GetHistogram()->SetYTitle("\\Delta Zd [\\circ]"); + line.DrawLine(g->GetXaxis()->GetXmin(), 360./16384, g->GetXaxis()->GetXmax(), 360./16384); + line.DrawLine(g->GetXaxis()->GetXmin(), -360./16384, g->GetXaxis()->GetXmax(), -360./16384); + cout << "Mean dZd: " << g->GetMean(2) << " \xb1 " << g->GetRMS(2) << endl; + cout << endl; + +#ifndef PRESENTATION + c1->cd(5); +#else + c1->cd(2); +#endif + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + g=(TGraph*)gzd.DrawClone("A*"); + g->SetBit(kCanDelete); + g->GetHistogram()->SetXTitle("Zd [\\circ]"); + g->GetHistogram()->SetYTitle("\\Delta Zd [\\circ]"); + line.DrawLine(g->GetXaxis()->GetXmin(), 360./16384, g->GetXaxis()->GetXmax(), 360./16384); + line.DrawLine(g->GetXaxis()->GetXmin(), -360./16384, g->GetXaxis()->GetXmax(), -360./16384); +#ifndef PRESENTATION + c1->cd(6); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + if (gmzd.GetN()>0) + { + g=(TGraph*)gmzd.DrawClone("A*"); + g->SetBit(kCanDelete); + g->GetHistogram()->SetXTitle("Mag"); + g->GetHistogram()->SetYTitle("\\Delta Zd [\\circ]"); + line.DrawLine(g->GetXaxis()->GetXmin(), 360./16384, g->GetXaxis()->GetXmax(), 360./16384); + line.DrawLine(g->GetXaxis()->GetXmin(), -360./16384, g->GetXaxis()->GetXmax(), -360./16384); + } +#endif + +#ifndef PRESENTATION + c1->cd(7); +#else + c1->cd(3); +#endif + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + g=(TGraph*)graz.DrawClone("AP"); + g->SetBit(kCanDelete); + g->GetHistogram()->SetXTitle("Az [\\circ]"); + g->GetHistogram()->SetYTitle("\\Delta [\\circ]"); + line.DrawLine(g->GetXaxis()->GetXmin(), 360./16384, g->GetXaxis()->GetXmax(), 360./16384); + + proaz.SetLineWidth(2); + proaz.SetLineColor(kBlue); + proaz.SetMarkerColor(kBlue); + proaz.DrawCopy("pc hist same"); + +#ifndef PRESENTATION + c1->cd(8); +#else + c1->cd(4); +#endif + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + g=(TGraph*)grzd.DrawClone("AP"); + g->SetBit(kCanDelete); + g->GetHistogram()->SetXTitle("Zd [\\circ]"); + g->GetHistogram()->SetYTitle("\\Delta [\\circ]"); + line.DrawLine(g->GetXaxis()->GetXmin(), 360./16384, g->GetXaxis()->GetXmax(), 360./16384); + + prozd.SetLineWidth(2); + prozd.SetLineColor(kBlue); + prozd.SetMarkerColor(kBlue); + prozd.DrawCopy("pc hist same"); + +#ifndef PRESENTATION + c1->cd(9); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + if (grmag.GetN()>0) + { + g=(TGraph*)grmag.DrawClone("AP"); + g->SetBit(kCanDelete); + g->GetHistogram()->SetXTitle("Mag"); + g->GetHistogram()->SetYTitle("\\Delta [\\circ]"); + line.DrawLine(g->GetXaxis()->GetXmin(), 360./16384, g->GetXaxis()->GetXmax(), 360./16384); + } + promag.SetLineWidth(2); + promag.SetLineColor(kBlue); + promag.SetMarkerColor(kBlue); + promag.DrawCopy("pc hist same"); +#endif + + // + // Print out the residual before and after correction in several + // units + // + cout << fCoordinates.GetSize() << " data sets." << endl << endl; + cout << "Total Spread of Residual:" << endl; + cout << "-------------------------" << endl; + cout << "before: " << Form("%6.4f", hres1.GetMean()) << " \xb1 " << Form("%6.4f", hres1.GetRMS()) << " deg \t"; + cout << "before: " << Form("%4.1f", hres1.GetMean()*60) << " \xb1 " << Form("%.1f", hres1.GetRMS()*60) << " arcmin" << endl; + cout << "after: " << Form("%6.4f", hres2.GetMean()) << " \xb1 " << Form("%6.4f", hres2.GetRMS()) << " deg \t"; + cout << "after: " << Form("%4.1f", hres2.GetMean()*60) << " \xb1 " << Form("%.1f", hres2.GetRMS()*60) << " arcmin" << endl; + cout << "backw: " << Form("%6.4f", hres3.GetMean()) << " \xb1 " << Form("%6.4f", hres3.GetRMS()) << " deg \t"; + cout << "backw: " << Form("%4.1f", hres3.GetMean()*60) << " \xb1 " << Form("%.1f", hres3.GetRMS()*60) << " arcmin" << endl; + cout << endl; + cout << "before: " << Form("%4.1f", hres1.GetMean()*16348/360) << " \xb1 " << Form("%.1f", hres1.GetRMS()*16384/360) << " SE \t\t"; + cout << "before: " << Form("%4.1f", hres1.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres1.GetRMS()*60*60/23.4) << " pix" << endl; + cout << "after: " << Form("%4.1f", hres2.GetMean()*16384/360) << " \xb1 " << Form("%.1f", hres2.GetRMS()*16384/360) << " SE \t\t"; + cout << "after: " << Form("%4.1f", hres2.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres2.GetRMS()*60*60/23.4) << " pix" << endl; + cout << "backw: " << Form("%4.1f", hres3.GetMean()*16384/360) << " \xb1 " << Form("%.1f", hres3.GetRMS()*16384/360) << " SE \t\t"; + cout << "backw: " << Form("%4.1f", hres3.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres3.GetRMS()*60*60/23.4) << " pix" << endl; + cout << endl; + cout << endl; // ± + + + before = hres1.GetMean()*16384/360; + after = hres2.GetMean()*16384/360; + backw = hres3.GetMean()*16384/360; + + + gStyle->SetOptStat(1110); + gStyle->SetStatFormat("6.2g"); + + if (gROOT->FindObject("CanvResiduals")) + c1 = dynamic_cast(gROOT->FindObject("CanvResiduals")); + else + c1=new TCanvas("CanvResiduals", "Residuals", 800, 800); + + gROOT->SetSelectedPad(0); + c1->SetSelectedPad(0); + c1->Clear(); + c1->SetFillColor(kWhite); + + c1->Divide(2, 2, 1e-10, 1e-10); + + c1->cd(2); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + hres1.SetLineColor(kRed); + hres1.DrawCopy(); + + gPad->Update(); + + line.DrawLine(360./16384, gPad->GetUymin(), 360./16384, gPad->GetUymax()); + + c1->cd(4); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + hres2.SetLineColor(kBlue); + TH1 *h=hres2.DrawCopy(); + TF1 f("mygaus", "(gaus)", 0, 1); + f.SetLineColor(kMagenta/*6*/); + f.SetLineWidth(1); + f.SetParameter(0, h->GetBinContent(1)); + f.FixParameter(1, 0); + f.SetParameter(2, h->GetRMS()); + h->Fit("mygaus", "QR"); + hres3.SetLineColor(kCyan); + hres3.SetLineStyle(kDashed); + hres3.DrawCopy("same"); + cout << "Gaus-Fit Sigma: " << f.GetParameter(2) << "\xb0" << endl; + cout << "Fit-Probability: " << f.GetProb()*100 << "%" << endl; + cout << " Chi^2/NDF: " << f.GetChisquare() << "/" << f.GetNDF() << " = " << f.GetChisquare()/f.GetNDF() << endl; + gPad->Update(); + line.DrawLine(360./16384, gPad->GetUymin(), 360./16384, gPad->GetUymax()); + + c1->cd(1); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetTheta(90); + gPad->SetPhi(90); + TH2F h2res1("Res2D1", " Dataset positions on the sky ", 36, 0, 360, 8, 0, 90); + h2res1.SetBit(TH1::kNoStats); + h2res1.DrawCopy("surf1pol"); + gPad->Modified(); + gPad->Update(); + DrawHorizon(gPad); + for (int i=0; icd(3); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetTheta(90); + gPad->SetPhi(90); + h2res1.SetTitle(" Arb. Residuals after correction (scaled) "); + h2res1.DrawCopy("surf1pol"); + gPad->Modified(); + gPad->Update(); +// for (int i=0; i +#endif + +#ifndef ROOT_TGFileDialog +#include +#endif + +#include "MPointing.h" + +class MGList; // To be removed!!! +class TPointStar; + +class TGLabel; + +class TPointGui : public TGMainFrame +{ +private: + enum { + kTbFit = 1024, + kTbLoad, + kTbSave, + kTbLoadStars, + kTbReset, + kTbResetStars, + kTbReloadStars + }; + + MGList *fList; + + TList fOriginal; + TList fCoordinates; + TList fLabel; + + MPointing fBending; + + TString fFileNameStars; + + FontStruct_t fFont; + + Bool_t fExitLoopOnClose; + + void Fcn(Int_t &/*npar*/, Double_t */*gin*/, Double_t &f, Double_t *par, Int_t /*iflag*/); + static void fcn(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag); + + void AddTextButton(TGCompositeFrame *f, TString txt, Int_t id=-1, TGLayoutHints *h=0); + void AddCheckButton(TGCompositeFrame *f, TString txt, Int_t id=-1, TGLayoutHints *h=0); + void AddResetButton(TGCompositeFrame *f, Int_t id, TGLayoutHints *h, Int_t height); + TGLabel *AddLabel(TGCompositeFrame *f, TString txt, TGLayoutHints *h=0); + + void DisplayBending(); + void DisplayData(); + void DisplayResult(Double_t before, Double_t after, Double_t backw); + + void DrawMarker(TVirtualPad *pad, Double_t r0, Double_t phi0); + void DrawPolLine(TVirtualPad *pad, Double_t r0, Double_t phi0, Double_t r1, Double_t phi1); + void DrawSet(TVirtualPad *pad, TPointStar &set, Float_t scale=-1, Float_t angle=0); + void DrawHorizon(TVirtualPad *pad, const char *fname="horizon.dat") const; + + TString OpenDialog(EFileDialogMode mode=kFDOpen); + + void LoadCollection(TString fname); + void LoadStars(TString fname="tpoint.txt"); + + Bool_t ProcessMessage(Long_t msg, Long_t mp1, Long_t); + + void Fit(Double_t &before, Double_t &after, Double_t &backw); + +public: + TPointGui(const char *fname=NULL); + ~TPointGui(); + + void SetExitLoopOnClose(Bool_t b=kTRUE) { fExitLoopOnClose=b; } + + ClassDef(TPointGui, 0) +}; + +#endif Index: /trunk/MagicSoft/Cosy/tpoint/TPointIncl.h =================================================================== --- /trunk/MagicSoft/Cosy/tpoint/TPointIncl.h (revision 8823) +++ /trunk/MagicSoft/Cosy/tpoint/TPointIncl.h (revision 8823) @@ -0,0 +1,5 @@ +#ifndef __CINT__ + +#include "coord.h" + +#endif // __CINT__ Index: /trunk/MagicSoft/Cosy/tpoint/TPointLinkDef.h =================================================================== --- /trunk/MagicSoft/Cosy/tpoint/TPointLinkDef.h (revision 8823) +++ /trunk/MagicSoft/Cosy/tpoint/TPointLinkDef.h (revision 8823) @@ -0,0 +1,11 @@ +#ifdef __CINT__ + +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; + +//#pragma link C++ class TPoint+; +#pragma link C++ class TPointStar+; +#pragma link C++ class TPointGui+; + +#endif Index: /trunk/MagicSoft/Cosy/tpoint/TPointStar.cc =================================================================== --- /trunk/MagicSoft/Cosy/tpoint/TPointStar.cc (revision 8823) +++ /trunk/MagicSoft/Cosy/tpoint/TPointStar.cc (revision 8823) @@ -0,0 +1,145 @@ +#include "TPointStar.h" + +#include + +#include "MLog.h" +#include "MLogManip.h" + +#include "MPointing.h" + +ClassImp(TPointStar); + +using namespace std; + +TPointStar::TPointStar(Double_t sel, Double_t saz, Double_t rel, Double_t raz) : + fStarAz(saz*TMath::DegToRad()), + fStarEl(sel*TMath::DegToRad()), + fRawAz(raz*TMath::DegToRad()), + fRawEl(rel*TMath::DegToRad()), fMag(-25) +{ +} + +Double_t TPointStar::GetDEl() const { return (fRawEl-fStarEl)*TMath::RadToDeg(); } +Double_t TPointStar::GetDZd() const { return -GetDEl(); } +Double_t TPointStar::GetDAz() const { return (fRawAz-fStarAz)*TMath::RadToDeg(); } +Double_t TPointStar::GetStarEl() const { return fStarEl*TMath::RadToDeg(); } +Double_t TPointStar::GetStarZd() const { return 90.-fStarEl*TMath::RadToDeg(); } +Double_t TPointStar::GetStarAz() const { return fStarAz*TMath::RadToDeg(); } +Double_t TPointStar::GetRawEl() const { return fRawEl*TMath::RadToDeg(); } +Double_t TPointStar::GetRawAz() const { return fRawAz*TMath::RadToDeg(); } +Double_t TPointStar::GetRawZd() const { return 90.-fRawEl*TMath::RadToDeg(); } + +ZdAz TPointStar::GetStarZdAz() const { return ZdAz(TMath::Pi()/2-fStarEl, fStarAz); } +AltAz TPointStar::GetStarAltAz() const { return AltAz(fStarEl, fStarAz); } + +ZdAz TPointStar::GetRawZdAz() const { return ZdAz(TMath::Pi()/2-fRawEl, fRawAz); } +AltAz TPointStar::GetRawAltAz() const { return AltAz(fRawEl, fRawAz); } + +void TPointStar::AdjustEl(Double_t del) { fStarEl += del*TMath::DegToRad(); } +void TPointStar::AdjustAz(Double_t daz) { fStarAz += daz*TMath::DegToRad(); } + +void TPointStar::Adjust(const MPointing &bend) +{ + AltAz p = bend(GetStarAltAz()); + fStarEl = p.Alt(); + fStarAz = p.Az(); +} + +void TPointStar::AdjustBack(const MPointing &bend) +{ + AltAz p = bend.CorrectBack(GetRawAltAz()); + fRawEl = p.Alt(); + fRawAz = p.Az(); +} + +Double_t TPointStar::GetResidual(Double_t *err) const + { + /* + TVector3 v1, v2; + v1.SetMagThetaPhi(1, TMath::Pi()/2-fRawEl, fRawAz); + v2.SetMagThetaPhi(1, TMath::Pi()/2-fStarEl, fStarAz); + + return v1.Angle(v2)*TMath::RadToDeg(); + */ + + const Double_t del = fRawEl-fStarEl; + const Double_t daz = fRawAz-fStarAz; + + /* + const Double_t dphi2 = daz/2.; + const Double_t cos2 = cos(dphi2)*cos(dphi2); + const Double_t sin2 = sin(dphi2)*sin(dphi2); + const Double_t d = cos(del)*cos2 - cos(fRawEl+fStarEl)*sin2; + */ + const Double_t d = cos(del) - cos(fRawEl)*cos(fStarEl)*(1.-cos(daz)); + + if (err) + { + // Error of one pixel in the CCD + const Double_t e1 = 32./3600*TMath::DegToRad() * 0.5; + + // Error of one SE unit + const Double_t e2 = 360./16384*TMath::DegToRad() * 0.5; + + const Double_t e11 = sin(del)+cos(fRawEl)*sin(fStarEl)*(1-cos(daz)); + const Double_t e12 = cos(fRawEl)*cos(fStarEl)*sin(daz); + + const Double_t e21 = -sin(del)+sin(fRawEl)*cos(fStarEl)*(1-cos(daz)); + const Double_t e22 = -cos(fRawEl)*cos(fStarEl)*sin(daz); + + const Double_t err1 = sqrt(1-d*d); + const Double_t err2 = (e11*e11 + e12*e12)*e1*e1; + const Double_t err3 = (e21*e21 + e22*e22)*e2*e2; + + *err = sqrt(err2+err3)/err1 * TMath::RadToDeg(); + } + + const Double_t dist = acos(d); + return dist * TMath::RadToDeg(); + } + +istream &operator>>(istream &fin, TPointStar &set) +{ + TString str; + do + { + str.ReadLine(fin); + if (!fin) + return fin; + } while (str[0]=='#'); + + Float_t v[4], mag; + Int_t n = sscanf(str.Data(), "%f %f %f %f %*f %*f %*f %*f %*f %*f %f", v, v+1, v+2, v+3, &mag); + if (n<4) + { + gLog << err << "Read: ERROR - Not enough numbers" << endl; + return fin; + } + set.fMag = n<5 ? -25 : mag; + + set.fStarAz = v[0]*TMath::DegToRad(); + set.fStarEl = v[1]*TMath::DegToRad(); + + set.fRawAz = v[2]*TMath::DegToRad(); + set.fRawEl = v[3]*TMath::DegToRad(); + + if (fin) + { + Double_t res, err; + res = set.GetResidual(&err); + gLog << inf << "Read: " << v[0] << " " << v[1] << " : " << v[2] << " " << v[3] << " : " << v[2]-v[0] << " " << v[3]-v[1] << " : " << res << " " << err << " " << err/res << endl; + } + + return fin; +} + +ostream &operator<<(ostream &out, TPointStar &set) +{ + out << Form("%8.3f", set.fStarAz*TMath::RadToDeg()) << " "; + out << Form("%8.3f", set.fStarEl*TMath::RadToDeg()) << " "; + out << Form("%8.3f", set.fRawAz*TMath::RadToDeg()) << " "; + out << Form("%8.1f", set.fRawEl*TMath::RadToDeg()) << " "; + out << set.fMag; + + return out; +} Index: /trunk/MagicSoft/Cosy/tpoint/TPointStar.h =================================================================== --- /trunk/MagicSoft/Cosy/tpoint/TPointStar.h (revision 8823) +++ /trunk/MagicSoft/Cosy/tpoint/TPointStar.h (revision 8823) @@ -0,0 +1,98 @@ +#ifndef COSY_TPointStar +#define COSY_TPointStar + +#ifndef ROOT_TObject +#include +#endif + +//class istream; +//class ostream; + +class ZdAz; +class AltAz; + +class MPointing; + +class TPointStar : public TObject +{ + friend istream &operator>>(istream &fin, TPointStar &set); + friend ostream &operator<<(ostream &fout, TPointStar &set); +private: + Double_t fStarAz; + Double_t fStarEl; + + Double_t fRawAz; + Double_t fRawEl; + + Double_t fMag; +public: + TPointStar(Double_t sel=0, Double_t saz=0, Double_t rel=0, Double_t raz=0);/* + fStarAz(saz*TMath::DegToRad()), + fStarEl(sel*TMath::DegToRad()), + fRawAz(raz*TMath::DegToRad()), + fRawEl(rel*TMath::DegToRad()), fMag(-25) + { + }*/ + + Double_t GetMag() const { return fMag; } + Double_t GetResidual(Double_t *err=0) const; + + void operator=(TPointStar &set) + { + fStarAz = set.fStarAz; + fStarEl = set.fStarEl; + fRawAz = set.fRawAz; + fRawEl = set.fRawEl; + fMag = set.fMag; + } + + Double_t GetDEl() const;// { return (fRawEl-fStarEl)*TMath::RadToDeg(); } + Double_t GetDZd() const;// { return -GetDEl(); } + Double_t GetDAz() const;// { return (fRawAz-fStarAz)*TMath::RadToDeg(); } + Double_t GetStarEl() const;// { return fStarEl*TMath::RadToDeg(); } + Double_t GetStarZd() const;// { return 90.-fStarEl*TMath::RadToDeg(); } + Double_t GetStarAz() const;// { return fStarAz*TMath::RadToDeg(); } + Double_t GetRawEl() const;// { return fRawEl*TMath::RadToDeg(); } + Double_t GetRawAz() const;// { return fRawAz*TMath::RadToDeg(); } + Double_t GetRawZd() const;// { return 90.-fRawEl*TMath::RadToDeg(); } + + ZdAz GetStarZdAz() const;// { return ZdAz(TMath::Pi()/2-fStarEl, fStarAz); } + AltAz GetStarAltAz() const;// { return AltAz(fStarEl, fStarAz); } + + ZdAz GetRawZdAz() const;// { return ZdAz(TMath::Pi()/2-fRawEl, fRawAz); } + AltAz GetRawAltAz() const;// { return AltAz(fRawEl, fRawAz); } + + void AdjustEl(Double_t del);// { fStarEl += del*TMath::DegToRad(); } + void AdjustAz(Double_t daz);// { fStarAz += daz*TMath::DegToRad(); } + + void Adjust(const MPointing &bend);/* + { + AltAz p = bend(GetStarAltAz()); + fStarEl = p.Alt(); + fStarAz = p.Az(); + }*/ + void AdjustBack(const MPointing &bend);/* + { + AltAz p = bend.CorrectBack(GetRawAltAz()); + fRawEl = p.Alt(); + fRawAz = p.Az(); + }*/ + ClassDef(TPointStar, 1) +}; + +/* +class TPoint : public TPointStar +{ +public: + TPoint(Double_t sel=0, Double_t saz=0, Double_t rel=0, Double_t raz=0) + : TPointStar(sel, saz, rel, raz) + { + } + ClassDef(TPoint, 1) +}; +*/ + +istream &operator>>(istream &fin, TPointStar &set); +ostream &operator<<(ostream &out, TPointStar &set); + +#endif Index: /trunk/MagicSoft/Cosy/tpoint/skull.xpm =================================================================== --- /trunk/MagicSoft/Cosy/tpoint/skull.xpm (revision 8823) +++ /trunk/MagicSoft/Cosy/tpoint/skull.xpm (revision 8823) @@ -0,0 +1,24 @@ +/* XPM */ +static char * skull_xpm[] = { +"17 17 4 1", +" c None", +"o c #E0E0E0", +". c #BBBBBB", +"+ c #101010", +".................", +"......++++.......", +".....++++++......", +"....++++++++.....", +"...++oo++oo++....", +"...++oo++oo++....", +"....++++++++.....", +".....++++++......", +".+....++++.....+.", +".+....++++....++.", +"..+....++....+...", +"...+++....+++....", +"......++++.......", +"....++++++++...+.", +".++++......+++++.", +".+............+..", +"................."};