Changeset 4865

Timestamp:

09/05/04 18:56:47 (20 years ago)

Author:

rwagner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• caos/Led.h (modified) (1 diff)
• caos/Rings.cc (modified) (1 diff)
• caos/Rings.h (modified) (1 diff)
• catalog/StarCatalog.cc (modified) (3 diffs)
• catalog/StarCatalog.h (modified) (3 diffs)
• gui/GuiLinkDef.h (modified) (1 diff)
• gui/MGStarg.cc (added)
• gui/MGStarg.h (added)
• gui/Makefile (modified) (1 diff)
• main/MCaos.cc (modified) (12 diffs)
• main/MCaos.h (modified) (3 diffs)
• main/MCosy.h (modified) (1 diff)
• main/MStargHistograms.cc (added)
• main/MStargHistograms.h (added)
• main/MStarguider.cc (modified) (43 diffs)
• main/MStarguider.h (modified) (8 diffs)
• main/MainLinkDef.h (modified) (1 diff)
• main/Makefile (modified) (1 diff)
• prepos_magic.txt (modified) (1 diff)
• starg.cc (modified) (1 diff)
• stargleds.txt (added)
• stars.txt (modified) (4 diffs)
• tcpip/MCeCoCom.cc (modified) (2 diffs)
• tcpip/MCeCoCom.h (modified) (1 diff)
• tcpip/MDriveCom.cc (modified) (1 diff)
• tcpip/MDriveCom.h (modified) (1 diff)
• tcpip/MTcpIpIO.cc (modified) (2 diffs)
• tcpip/MTcpIpIO.h (modified) (1 diff)
• videodev/FilterLed.cc (modified) (5 diffs)
• videodev/FilterLed.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/caos/Led.h

@@ -40 +40 @@
     }
 
+    void SetX(Double_t x)     { fX=x; }
+    void SetY(Double_t y)     { fY=y; }
+
     Double_t GetX() const    { return fX; }
     Double_t GetY() const    { return fY; }

trunk/MagicSoft/Cosy/caos/Rings.cc

@@ -14 +14 @@
     int nPoints = leds.GetEntries();
 
-    if (nPoints<5)
+    if (nPoints<fMinNumberLeds) 
         return;
 

trunk/MagicSoft/Cosy/caos/Rings.h

@@ -16 +16 @@
 private:
     Ring fCenter;
+    Short_t fMinNumberLeds;
 
     void CalcCenters(const Leds &leds, Float_t min, Float_t max);
 
 public:
-    Rings() : TClonesArray("Ring", 1) {}
+    Rings() : TClonesArray("Ring", 1) 
+        {
+            fMinNumberLeds=5;
+        }
+
+    void SetMinNumberLeds(Short_t n) { fMinNumberLeds=n; }
 
     void CalcRings(Leds &leds, Float_t min=-1, Float_t max=-1);

trunk/MagicSoft/Cosy/catalog/StarCatalog.cc

@@ -16 +16 @@
 ClassImp(StarCatalog);
 
-StarCatalog::StarCatalog(MObservatory::LocationName_t key) : SlaStars(key), fAstro(0), /*fSao(NULL), fSrt(NULL), fEntries(0),*/ fSinAngle(0), fCosAngle(1)
+StarCatalog::StarCatalog(MObservatory::LocationName_t key) : SlaStars(key), fW(768), fH(576), fAstro(0), /*fSao(NULL), fSrt(NULL), fEntries(0),*/ fSinAngle(0), fCosAngle(1), fBox(768)
 {
     fAstro = new MAstroCatalog;
@@ -136 +136 @@
     {
         const int mag = (10 - (star->GetMag()>1 ? (int)star->GetMag() : 1))/2;
-
-        Double_t color = 0xf0; //0x0f;
-        DrawCircle(color, img, (int)star->GetX(), (int)star->GetY(), mag);
+        Double_t color = 0xf0; //0x0f;       
+        // DrawStars flips the picture in X defaultwise now
+        DrawCircle(color, img, 768-(int)star->GetX(), (int)star->GetY(), mag);
     }
 }
 
-void StarCatalog::CalcStars(MStarList &list) const
-{
+void StarCatalog::CalcStars(MStarList &list)
+{
+    // full FOV
+    fBox=768;
+    CalcStars(list, 0, 576, 0, 0);
+}
+
+void StarCatalog::CalcStars(MStarList &list, int xc, int yc, 
+                            int xo, int yo) const
+{
+
+    // CalcStars flips the picture in X defaultwise now
+    int x0 = (768-xc)-fBox;
+    int x1 = (768-xc)+fBox;
+    int y0 = yc-fBox;
+    int y1 = yc+fBox;
+
+    if (x0<0) x0=0;
+    if (y0<0) y0=0;
+    if (x1>fW) x1=fW;
+    if (y1>fH) y1=fH;
+
     // Align stars into telescope system
     // (Move the telescope to pointing position)
@@ -196 +216 @@
         Float_t yy = loc.X()*fSinAngle + loc.Y()*fCosAngle;
 
-        if (xx<0 || xx >=768 || yy<0 || yy>=576)
+        if (xx<(x0-768/2) || xx >=(x1-768/2) 
+            || yy<(y0-(576/2+yo)) || yy>=(y1-(576/2+yo)))
             continue;
 
         // Store pixel coordinates of star in list
-        list.Add(xx+768/2, yy+576/2, -2.5*log10(mag));
+        list.Add(xx+768/2+xo, yy+576/2+yo, -2.5*log10(mag));
+
     }
 }

trunk/MagicSoft/Cosy/catalog/StarCatalog.h

@@ -25 +25 @@
 {
 private:
+
+    int fW;
+    int fH;
+
+ 
     MAstroCatalog *fAstro;
 
@@ -41 +46 @@
     void   SetRaDec(const RaDec &radec);
     void   SetAltAz(const AltAz &altaz);
+
+    int    fBox;
 
 public:
@@ -69 +76 @@
     }
 
-    void   CalcStars(MStarList &list) const;
+    void   CalcStars(MStarList &list, int xc, int yc, int xo, int yo) const;
+    void   CalcStars(MStarList &list);
     static void DrawStars(MStarList &list, byte *img);
+
+    void SetBox(int box)   { fBox = box; }
 
     ClassDef(StarCatalog, 0)

trunk/MagicSoft/Cosy/gui/GuiLinkDef.h

@@ -14 +14 @@
 #pragma link C++ class MGAccuracy+;
 #pragma link C++ class MGSkyPosition+;
+#pragma link C++ class MGStarg+;
 
 #pragma link C++ class MGCosy+;

trunk/MagicSoft/Cosy/gui/Makefile

@@ -38 +38 @@
            MGEmbeddedCanvas.cc \
            MGAccuracy.cc \
+           MGStarg.cc \
            MGSkyPosition.cc
-           
+  
 SRCS        = $(SRCFILES)
 HEADERS     = $(SRCFILES:.cc=.h)

trunk/MagicSoft/Cosy/main/MCaos.cc

@@ -116 +116 @@
 
     Rings r;
+    r.SetMinNumberLeds(fMinNumberLeds);
     r.CalcRings(fPositions);
 
@@ -159 +160 @@
         fHistw[i] = new TH1F;
         fHistw[i]->SetNameTitle(name, title);
-        fHistw[i]->SetBins(721, -180.5, 180.5);
-        fHistw[i]->SetXTitle("\\Phi [deg]");
+        fHistw[i]->SetBins(101, -50.5, 50.5);
+        fHistw[i]->SetXTitle("\\Phi [arcmin]");
         fHistw[i]->SetYTitle("counts");
     }
@@ -259 +260 @@
     c2->Update();
 
+    /*
     c = new TCanvas("ctime", "Timedevelopement of Center", 800, 800);
     c->Divide(1,3);
@@ -266 +268 @@
     h->SetYTitle("x [pix]");
     h->DrawCopy();
-    ((TPad*)gPad)->SetSelected(NULL);
+    c->SetSelectedPad(NULL);
     fGraphprx->DrawClone("ALP*")->SetBit(kCanDelete);
+    gPad->Modified();
+    gPad->Update();
     c->cd(2);
     h = fGraphpry->GetHistogram();
@@ -273 +277 @@
     h->SetYTitle("y [pix]");
     h->DrawCopy();
-    ((TPad*)gPad)->SetSelected(NULL);
-    fGraphpry->DrawClone("ALP*")->SetBit(kCanDelete);
+    //((TPad*)gPad)->SetSelectedPad(NULL);
+    //fGraphpry->DrawClone("ALP*")->SetBit(kCanDelete);
     c->cd(3);
     h = fGraphr->GetHistogram();
@@ -280 +284 @@
     h->SetYTitle("r [pix]");
     h->DrawCopy();
-    ((TPad*)gPad)->SetSelected(NULL);
-    fGraphr->DrawClone("ALP*")->SetBit(kCanDelete);
+    //((TPad*)gPad)->SetSelectedPad(NULL);
+    //fGraphr->DrawClone("ALP*")->SetBit(kCanDelete);
     c->Modified();
     c->Update();
+    */
 
     c = new TCanvas("crot", "rotation angle", 800, 600);
@@ -291 +296 @@
     fHistallw->SetYTitle("counts");
     fHistallw->DrawCopy();
+    /*
     c->cd(2);
     h = fGraphw->GetHistogram();
@@ -298 +304 @@
     ((TPad*)gPad)->SetSelected(NULL);
     fGraphw->DrawClone("ALP*")->SetBit(kCanDelete);
-
+    */
 
     /* --------------------------------------------------------
@@ -325 +331 @@
 }
 
-Ring MCaos::Run(byte *img, bool printl, bool printr, const ZdAz &pos, const MTime &t)
+Ring MCaos::Run(byte *img, bool printl, bool printr, const ZdAz &pos, const MTime &t, Double_t box, Double_t cut)
 {
     Leds &leds = *fLeds;
@@ -331 +337 @@
 
     //          img  width height radius sigma
-    FilterLed f(img, 768, 576, 50, 3.0);
+    FilterLed f(img, 768, 576, box, cut);
 
     Int_t first=0;
@@ -365 +371 @@
 
     Rings rings;
-    rings.CalcRings(leds, 265, 268);
+    rings.SetMinNumberLeds(fMinNumberLeds);
+//    rings.CalcRings(leds, 265, 268); 
+// rwagner
+//    rings.CalcRings(leds, 158, 164);
+    rings.CalcRings(leds, fMinRadius, fMaxRadius);
 
     const Ring &center = rings.GetCenter();
+    
+    center.Print();
 
     // FIXME!
@@ -393 +405 @@
             {
                 0,
-                0,
-                0,
-                0,
-                0,
-                0
+                0,
+                0,
+                0,
+                0,
+                0
             };
 

trunk/MagicSoft/Cosy/main/MCaos.h

@@ -45 +45 @@
     TGraph        *fGraphr;
 
+    Short_t       fMinNumberLeds;
+    Double_t      fMinRadius;
+    Double_t      fMaxRadius;
+
 public:
-    MCaos() : fFile(NULL), fHistpr(NULL)
+    MCaos() : fFile(NULL), fHistpr(NULL), fMinNumberLeds(5), fMinRadius(265), fMaxRadius(268)
     {
         fLeds = new Leds;
     }
+    
     ~MCaos()
     {
@@ -66 +71 @@
     void OpenFile();
     void CloseFile();
+    
+    void SetMinNumberRings(Short_t n) 
+    {
+        fMinNumberLeds = n;
+    }
+
+    void SetRadii(Double_t min, Double_t max) 
+    {  
+        fMinRadius=min;
+        fMaxRadius=max;
+    }
 
     void InitHistograms();
@@ -72 +88 @@
     void ResetHistograms();
 
-    Ring Run(byte *img, bool printl, bool printr, const ZdAz &pos, const MTime &t);
+    Ring Run(byte *img, bool printl, bool printr, const ZdAz &pos, 
+             const MTime &t, Double_t box, Double_t cut);
 };
 

trunk/MagicSoft/Cosy/main/MCosy.h

@@ -203 +203 @@
     MLog *GetOutRep() { return fOutRep; }
 
+    //rwagner
+    MDriveCom *GetDriveCom() { return fCom; }
+
     // static ZdAz CorrectTarget(const ZdAz &src, const ZdAz &dst);
     //    static ZdAz RaDec2ZdAz(const double mjd, const RaDec &pos, const RaDec &pm=RaDec(0,0));

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ +1 @@
+#define EXPERT
+
 #include "MStarguider.h"
 
@@ -9 +11 @@
 #include <TTimer.h>
 #include <TSystem.h>
+#include <TFile.h> // temp writeout of histos
+#include "MAstro.h"
+#include "MString.h"
 
 #include <TGMenu.h>
@@ -15 +20 @@
 #include <TGSplitter.h>    // TGHorizontal3DLine
 #include <TGTextEntry.h>
-
+#include <TGLayout.h>
 #include "MString.h"
 
 #include "MCosy.h"
 #include "MCaos.h"
+// #include "MStargLeds.h"
+#include "MStargHistograms.h"
+#include "MDriveCom.h"
+
+#include "MGStarg.h" 
+#include "TGFrame.h"
 
 #include "MGImage.h"
@@ -91 +102 @@
     IDM_kCaosWriteStart,
     IDM_kCaosWriteStop,
-    IDM_kResetHistograms
+    IDM_kResetHistograms,
+    IDM_kStargHistograms,
+    IDM_kStargAnalysis,
+    IDM_kStargCaosFilter,
+    IDM_kStargLEDFilter,
+    IDM_kStargFindStar
+
 };
 
@@ -105 +122 @@
         fCosy->GetWin()->GetImage()->DoRedraw();
 
+    fGStarg->Update(fPos, fD);   
+ 
     return kTRUE;
 }
@@ -122 +141 @@
 
     fChannel = new MGPopupMenu(p);
-    fChannel->AddEntry("Channel #1", IDM_kChannel1);
-    fChannel->AddEntry("Channel #2", IDM_kChannel2);
+    fChannel->AddEntry("Starfield Camera", IDM_kChannel1);
+    fChannel->AddEntry("TPoint Camera", IDM_kChannel2);
     fChannel->CheckEntry(channel==0?IDM_kChannel1:IDM_kChannel2);
     fChannel->Associate(this);
@@ -134 +153 @@
     fDisplay->AddEntry("&Filter",      IDM_kFilter);
     fDisplay->AddEntry("Find &Star",   IDM_kFindStar);
-    fDisplay->AddEntry("C&aosFilter",  IDM_kCaosFilter);
-    fDisplay->AddEntry("Sao &Catalog", IDM_kCatalog);
+    fDisplay->AddEntry("C&aos Filter",  IDM_kCaosFilter);
+    fDisplay->AddEntry("SAO &Catalog", IDM_kCatalog);
+    fDisplay->AddEntry("Stretch",      IDM_kStretch);
+    fDisplay->AddSeparator();
     fDisplay->AddEntry("Starguider",   IDM_kStarguider);
-    fDisplay->AddEntry("Stretch",      IDM_kStretch);
+    fDisplay->AddEntry("Starguider LED Filter",  IDM_kStargCaosFilter);
+    fDisplay->AddEntry("Starguider Find Star",   IDM_kStargFindStar);
+    fDisplay->AddEntry("Starguider Analysis",   IDM_kStargAnalysis);
+    fDisplay->AddSeparator();    
     if (channel>=0)
         fDisplay->AddPopup("&Input",   fChannel);
-    fDisplay->DisableEntry(IDM_kStarguider);
+    fDisplay->DisableEntry(IDM_kStargAnalysis);
+    fDisplay->DisableEntry(IDM_kStargFindStar);
     fDisplay->CheckEntry(IDM_kStretch);
     fDisplay->Associate(this);
@@ -218 +243 @@
     {
         fInterpol->CheckEntry(IDM_kInterpol5);
-        fIntRate = 5;
+        fIntRate = 50;
     }
     else
@@ -247 +272 @@
 
     fCaosAnalyse = new MGPopupMenu(p);
-    fCaosAnalyse->AddEntry("S&tart Analyse", IDM_kCaosAnalStart);
-    fCaosAnalyse->AddEntry("St&opp Analyse", IDM_kCaosAnalStop);
+    fCaosAnalyse->AddEntry("S&tart Analysis", IDM_kCaosAnalStart);
+    fCaosAnalyse->AddEntry("St&op Analysis", IDM_kCaosAnalStop);
     fCaosAnalyse->DisableEntry(IDM_kCaosAnalStop);
     //    fCaosAnalyse->AddEntry("&Reset Histograms", IDM_kResetHistograms);
@@ -272 +297 @@
     fList->Add(fCaOs);
 
+    TGLayoutHints *hints2a = 
+        new TGLayoutHints(kLHintsCenterX|kLHintsCenterY|
+                          kLHintsExpandX|kLHintsExpandY,1,1);
+    fList->Add(hints2a);
+
+    fGStarg = new MGStarg(this, 235);
+    fGStarg->Move(530,596+5);
+    fList->Add(fGStarg);
+
     fCRaDec = new MGCoordinates(this, kETypeRaDec);
     fCRaDec->Move(4, fMenu->GetDefaultHeight()+584);
@@ -278 +312 @@
 
     fCZdAz = new MGCoordinates(this, kETypeZdAz, kFALSE);
-    fCZdAz->Move(240+12+10, fMenu->GetDefaultHeight()+584);
+    fCZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+581+12);
     AddFrame(fCZdAz);
     fList->Add(fCZdAz);
 
     fPZdAz = new MGCoordinates(this, kETypeZdAz, kFALSE);
-    fPZdAz->Move(240+12+10, fMenu->GetDefaultHeight()+630);
+    fPZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+627+2*12);
     AddFrame(fPZdAz);
     fList->Add(fPZdAz);
 
+    fDZdAz = new MGCoordinates(this, kETypeZdAz, kFALSE);
+    fDZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+673+3*12);
+    AddFrame(fDZdAz);
+    fList->Add(fDZdAz);
+
+    fSZdAz = new MGCoordinates(this, kETypeZdAz, kFALSE);
+    fSZdAz->Move(240+12+28, fMenu->GetDefaultHeight()+719+4*12);
+    AddFrame(fSZdAz);
+    fList->Add(fSZdAz);
+
     fTPoint = new TGTextButton(this, "TPoint");
-    fTPoint->Move(4, fMenu->GetDefaultHeight()+665);
+    fTPoint->Move(4, fMenu->GetDefaultHeight()+722+3*12+25);
     fTPoint->AllowStayDown(kTRUE);
     AddFrame(fTPoint);
@@ -295 +339 @@
     fFps = new TGLabel(this, "---fps");
     fFps->SetTextJustify(kTextRight);
-    fFps->Move(633, fMenu->GetDefaultHeight()+578);
+    fFps->Move(650-440, fMenu->GetDefaultHeight()+619+13+60+20);
     AddFrame(fFps);
     fList->Add(fFps);
@@ -301 +345 @@
     fPosZoom = new TGLabel(this, "----.--d/----.--d (----, ----)");
     fPosZoom->SetTextJustify(kTextRight);
-    fPosZoom->Move(620, fMenu->GetDefaultHeight()+678);
+    fPosZoom->Move(4, fMenu->GetDefaultHeight()+765);
     AddFrame(fPosZoom);
     fList->Add(fPosZoom);
 
-    TGLabel *l = new TGLabel(this, "Arb.-Sky Pos");
+    fSkyBright = new TGLabel(this, "Sky Brightness: ---         ");
+    fSkyBright->SetTextJustify(kTextLeft);
+    fSkyBright->Move(4, fMenu->GetDefaultHeight()+785);
+    AddFrame(fSkyBright);
+    fList->Add(fSkyBright);
+
+    TGLabel *l = new TGLabel(this, "arcsec/pix");
     l->SetTextJustify(kTextLeft);
-    l->Move(480+32, fMenu->GetDefaultHeight()+590);
+    l->Move(605-400, fMenu->GetDefaultHeight()+619+13+60);
     AddFrame(l);
     fList->Add(l);
 
-    l = new TGLabel(this, "arcsec/pix");
+    l = new TGLabel(this, "deg");
     l->SetTextJustify(kTextLeft);
-    l->Move(605, fMenu->GetDefaultHeight()+619+13);
+    l->Move(605-410, fMenu->GetDefaultHeight()+619-10+60);
     AddFrame(l);
     fList->Add(l);
 
-    l = new TGLabel(this, "deg");
+    l = new TGLabel(this, "Telescope pointing at");
     l->SetTextJustify(kTextLeft);
-    l->Move(605, fMenu->GetDefaultHeight()+619-10);
+    l->Move(240+12+20, fMenu->GetDefaultHeight()+584-5);
     AddFrame(l);
     fList->Add(l);
 
-    l = new TGLabel(this, "Pointing Pos");
+    l = new TGLabel(this, "Starguider position");
     l->SetTextJustify(kTextLeft);
-    l->Move(480+32, fMenu->GetDefaultHeight()+655);
+    l->Move(240+12+20, fMenu->GetDefaultHeight()+630+12-5);
     AddFrame(l);
     fList->Add(l);
 
-    const Double_t pixsize = 23.4;
+    l = new TGLabel(this, "Misspointing");
+    l->SetTextJustify(kTextLeft);
+    l->Move(240+12+20, fMenu->GetDefaultHeight()+676+2*12-5);
+    AddFrame(l);
+    fList->Add(l);
+
+#ifdef EXPERT
+    l = new TGLabel(this, "Misspointing/FindStar (Experts Only!)");
+    l->SetTextJustify(kTextLeft);
+    l->Move(240+12+20, fMenu->GetDefaultHeight()+722+3*12-5);
+    AddFrame(l);
+    fList->Add(l);
+#endif
+    
+    const Double_t pixsize = 48.8; // used to be 23.4
 
     fSao->SetPixSize(pixsize);
@@ -339 +403 @@
     fPixSize = new TGTextEntry(this, txt, IDM_kPixSize);
     fPixSize->SetAlignment(kTextCenterX);
-    fPixSize->Move(547, fMenu->GetDefaultHeight()+617+13);
+    fPixSize->Move(547-410, fMenu->GetDefaultHeight()+617+13+60);
     AddFrame(fPixSize);
     fList->Add(fPixSize);
@@ -345 +409 @@
     fAngle = new TGTextEntry(this, "         0", IDM_kAngle);
     fAngle->SetAlignment(kTextCenterX);
-    fAngle->Move(547, fMenu->GetDefaultHeight()+617-10);
+    fAngle->Move(547-410, fMenu->GetDefaultHeight()+617-10+60);
     AddFrame(fAngle);
     fList->Add(fAngle);
@@ -357 +421 @@
     //
     fZoomImage = new MGImage(this, kZOOM, kZOOM);
-    fZoomImage->Move(768-kZOOM-2, 700-kZOOM-2);
+    // fZoomImage->Move(768-kZOOM-2, 700-kZOOM-2);
+    fZoomImage->Move(4, 700-kZOOM-2+85);
     AddFrame(fZoomImage);
     fList->Add(fZoomImage);
@@ -374 +439 @@
     MapSubwindows();
     fTPoint->UnmapWindow();
+    fGStarg->UnmapWindow();
+    fPZdAz->UnmapWindow();
+    fDZdAz->UnmapWindow();
+    fSZdAz->UnmapWindow();
+    fSkyBright->UnmapWindow();
     MapWindow();
 
-    IconifyWindow();
+
+    //IconifyWindow();
 
     //------------------------------------------------------------
@@ -386 +457 @@
 
 MStarguider::MStarguider(MObservatory::LocationName_t obs, Int_t channel)
-: TGMainFrame(gClient->GetRoot(), 768, 740), fCosy(NULL), fOutTp(0), fDx((768-kZOOM)/2), fDy((512-kZOOM)/2)
-{
+    : TGMainFrame(gClient->GetRoot(), 768, 840), fCosy(NULL), fOutTp(0), fDx((768-kZOOM)/2), fDy((512-kZOOM)/2), fStatus(MDriveCom::kStandby)
+{
+    
     cout << " #### FIXME: Make MCaos Thread safe!" << endl;
 
@@ -393 +465 @@
     fRaDec = new RaDec(180, 40);
 
+    //    fStargLeds = new MStargLeds;
+    //    fStargLeds->ReadResources();
+
     fCaos = new MCaos;
     fCaos->ReadResources();
+
+    fStargCaos = new MCaos;
+    fStargCaos->ReadResources("stargleds.txt");
+    fStargCaos->SetMinNumberRings(2);
+    fStargCaos->SetRadii(158,164);
+
+    fStargHistograms = new MStargHistograms();
 
     InitGui(channel);
@@ -427 +509 @@
 
     delete fCaos;
+    delete fStargCaos;
+    //    delete fStargLeds;
+    delete fStargHistograms;
     delete fSao;
-    delete fRaDec;
+    delete fRaDec;    
 
     if (fOutTp)
@@ -491 +576 @@
             case IDM_kCatalog:
                 Toggle(fDisplay, IDM_kCatalog);
-                if (fDisplay->IsEntryChecked(IDM_kCatalog))
-                    fDisplay->EnableEntry(IDM_kStarguider);
-                else
-                {
-                    fDisplay->UnCheckEntry(IDM_kStarguider);
-                    fDisplay->DisableEntry(IDM_kStarguider);
-                }
+//              if (!fDisplay->IsEntryChecked(IDM_kCatalog))
+//                 {
+//                     fDisplay->UnCheckEntry(IDM_kStarguider);
+//                     fDisplay->DisableEntry(IDM_kStarguider);
+//                 } else {
+//                  fDisplay->EnableEntry(IDM_kStarguider);
+//              }
+                return kTRUE;
+
+           case IDM_kStargFindStar:
+                Toggle(fDisplay, IDM_kStargFindStar);         
+                if (fDisplay->IsEntryChecked(IDM_kStargFindStar)) {
+                    fSZdAz->MapWindow();
+                } else {
+                    fSZdAz->UnmapWindow();
+                }
                 return kTRUE;
 
             case IDM_kStarguider:
                 Toggle(fDisplay, IDM_kStarguider);
+
+                if (fDisplay->IsEntryChecked(IDM_kStarguider)) {        
+
+                    fLastBright = 0xff;
+
+                    fDisplay->DisableEntry(IDM_kFindStar);
+                    fDisplay->EnableEntry(IDM_kStargAnalysis);            
+                    
+                    fPZdAz->MapWindow();
+                    fDZdAz->MapWindow();
+                    fSkyBright->MapWindow();
+
+                    fSao->SetLimitMag(8.3);
+                    fIntRate = 125;
+
+                    fDisplay->CheckEntry(IDM_kCatalog);
+                    fGStarg->MapWindow();
+
+                    const Int_t ch0 = 
+                        fChannel->IsEntryChecked(IDM_kChannel1) ? 0 : 1;
+                    const Int_t ch1 = 0;
+
+                    if (ch0!=ch1)
+                    {
+
+                        delete fGetter;
+                        usleep(150000); // FIX: Device or resource busy.
+                        fGetter = new Camera(*this, ch1);
+                        ((Camera*)fGetter)->Loop(0);
+                    }
+
+                    fChannel->CheckEntry(IDM_kChannel1);
+                    fChannel->UnCheckEntry(IDM_kChannel2);
+                    fChannel->DisableEntry(IDM_kChannel2);
+
+                } else {
+
+                    fStatus = MDriveCom::kStandby;
+                
+                    fPZdAz->UnmapWindow();
+                    fDZdAz->UnmapWindow();
+                    fSkyBright->UnmapWindow();
+                    fGStarg->UnmapWindow();             
+                    fChannel->EnableEntry(IDM_kChannel2);
+                    fDisplay->EnableEntry(IDM_kFindStar);
+                    fDisplay->DisableEntry(IDM_kStargAnalysis);             
+                }
+
                 gSystem->Unlink("tracking_error.txt");
+
+                return kTRUE;
+
+            case IDM_kStargAnalysis:
+                Toggle(fDisplay, IDM_kStargAnalysis);
+                if (fDisplay->IsEntryChecked(IDM_kStargAnalysis)) {
+                    fStargHistograms->OpenFile();
+                } else {
+                    fStargHistograms->CloseFile();
+                }
+
+                return kTRUE;
+
+
+            case IDM_kStargHistograms:
+                Toggle(fDisplay, IDM_kStargHistograms);
+                return kTRUE;
+
+            case IDM_kStargLEDFilter:
+                Toggle(fDisplay, IDM_kStargLEDFilter);
                 return kTRUE;
 
             case IDM_kFilter:
-                Toggle(fDisplay, IDM_kFilter);
-                if (fDisplay->IsEntryChecked(IDM_kFilter))
-                    fDisplay->EnableEntry(IDM_kStarguider);
-                else
-                {
-                    fDisplay->UnCheckEntry(IDM_kStarguider);
-                    fDisplay->DisableEntry(IDM_kStarguider);
-                }
-                return kTRUE;
+                Toggle(fDisplay, IDM_kFilter);           
+                return kTRUE;
+
+//              case IDM_kFilterStarg:
+//                  Toggle(fDisplay, IDM_kFilterStarg);
+//                  if (fDisplay->IsEntryChecked(IDM_kFilterStarg))
+//                      fDisplay->EnableEntry(IDM_kStarguider);
+//                  else
+//                  {
+//                      fDisplay->UnCheckEntry(IDM_kStarguider);
+//                      fDisplay->DisableEntry(IDM_kStarguider);
+//                  }
+//                  return kTRUE;
 
             case IDM_kFindStar:
@@ -535 +701 @@
                 //    fCaos->OpenFile();
                 Toggle(fDisplay, IDM_kCaosFilter);
-                if (fDisplay->IsEntryChecked(IDM_kCaosFilter))
+                if (fDisplay->IsEntryChecked(IDM_kCaosFilter)) {
                     fMenu->AddPopup("&CaOs", fCaOs, NULL);
+                }
                 else
                 {
@@ -558 +725 @@
                 }
                 fMenu->Resize(fMenu->GetDefaultSize());
-                MapSubwindows();
+                MapSubwindows(); // maps everything, but we don't want that
+                fTPoint->UnmapWindow(); 
+                fGStarg->UnmapWindow();
+                fPZdAz->UnmapWindow();
+                fDZdAz->UnmapWindow();
+                fSZdAz->UnmapWindow();
+                fSkyBright->UnmapWindow();
                 MapWindow();
                 return kTRUE;
+
+            case IDM_kStargCaosFilter:             
+                Toggle(fDisplay, IDM_kStargCaosFilter);                
+                if (fDisplay->IsEntryEnabled(IDM_kStargCaosFilter)) {
+                    fDisplay->EnableEntry(IDM_kStargFindStar);
+                } else {
+                    fDisplay->DisableEntry(IDM_kStargFindStar);
+                }
+                return kTRUE;
 
             case IDM_kCaosPrintLeds:
@@ -665 +847 @@
                     const Int_t ch0 = fChannel->IsEntryChecked(IDM_kChannel1) ? 0 : 1;
                     const Int_t ch1 = mp1==IDM_kChannel1                      ? 0 : 1;
-                    if (ch0==ch1)
+
+                    if (ch0==ch1)
                         return kTRUE;
 
@@ -754 +937 @@
     // Viewable area (FIXME: AZ)
     //
-    TH2F h("Hist", "dX/dY", 77, -768/2-.5, 768/2+.5, 58, -576/2-.5, 576/2+.5); // 3
-
-    /*
+    // TH2F h("Hist", "dX/dY", 77, -768/2-.5, 768/2+.5, 58, -576/2-.5, 576/2+.5); // 3
+    // chose a bit coarser binning to enhance excess 
+    // important: chose binning symmetrical around (0|0)!
+    TH2F h("Hist", "dX/dY", 49, -768/2-8, 768/2+8, 37, -576/2-8, 576/2+8); // 3
+
     TH1F hmag("HistMag", "Mag", 19, 0, 100);
     for (int i=0; i<mag.GetSize(); i++)
         hmag.Fill(mag[i]);
-        */
-
+    
     //
     // Search for matching Magnitudes
@@ -772 +956 @@
 
     //
-    // Serach for an excess in the histogram
+    // Search for an excess in the histogram
     //
     Int_t mx, my, dummy;
@@ -783 +967 @@
     const double dy   = h.GetYaxis()->GetBinWidth(my);
 
+#ifdef EXPERT
     cout << setprecision(3);
     cout << "Cut-XY:       " << xmax << " +- " << dx << " / " << ymax << " +- " << dy << endl;
+#endif
 
     TGraph g;
@@ -790 +976 @@
     {
         if (!(x[i]>xmax-dx && x[i]<xmax+dx &&
-              y[i]>ymax-dy && y[i]<ymax+dy &&
-              mag[i]>48-15 && mag[i]<48+15))
+              y[i]>ymax-dy && y[i]<ymax+dy /*&&
+                                             mag[i]>48-15 && mag[i]<48+15*/))
             continue;
 
-        g.SetPoint(g.GetN(), x[i], y[i]);
-    }
-
+        g.SetPoint(g.GetN(), x[i], y[i]);       
+    }
+  
+#ifdef EXPERT
     cout << "Offset-XY:    " << g.GetMean(1) << " +- " << g.GetRMS(1) << " / ";
     cout << g.GetMean(2) << " +- " << g.GetRMS(2) << endl;
+#endif
 
     AltAz pos0 = fSao->CalcAltAzFromPix(768/2,              576/2)*kRad2Deg;
@@ -817 +1005 @@
     fout2 << -pos1.Alt() << " " << pos1.Az() << endl;
 
+//    if (g.GetMean(1)>9 || g.GetMean(2)>9) {
+//      TFile f1("sguider-highoffset.root","UPDATE");
+//      h.Write();
+//      hmag.Write();
+//      g.Write();
+//      f1.Close(); 
+//    } else {
+//      TFile f1("sguider-niceoffset.root","UPDATE");
+//     h.Write();
+//      hmag.Write();
+//      g.Write();
+ //     f1.Close();
+        
+
+//      }
+
     return ZdAz(-pos1.Alt(), pos1.Az());
 }
 
-void MStarguider::CalcTrackingError(Leds &leds, MStarList &stars)
+bool MStarguider::CalcTrackingError(Leds &leds, MStarList &stars, ZdAz &d, MTime &t)
 {
     const Int_t max = leds.GetEntries();
-
-    if (stars.GetRealEntries() < 3)
-    {
-        cout << "Sorry, less than 3 stars in FOV!" << endl;
-        return;
-    }
-
-    if (max < 1)
-    {
-        cout << "Sorry, less than 1 detected spot in FOV!" << endl;
-        return;
-    }
+      if (stars.GetRealEntries() < 3)
+      {
+          cout << "Sorry, less than 3 stars in FOV!" << endl;
+          return kFALSE;
+      }
+      if (max < 3) //was 1
+      {
+          cout << "Sorry, less than 3 detected spot in FOV!" << endl;    
+          return kFALSE;         
+      }
 
     stars.Sort(); // Sort by magnitude
 
     TString str = "data/tracking_";
-    str += fSao->GetMjd()-52000;
+    str += fSao->GetMjd();
     str += ".txt";
 
@@ -848 +1050 @@
     Int_t num = 0;
 
-    // FIXME: Is predifined value 3 a good idea?
+    // FIXME: Is predefined value 3 a good idea?
 
     MStar *star;
     MStarListIter NextStar(&stars);
-    while ((star=NextStar()) && num++<max+3)
+    while ((star=NextStar()) && num++<max+3) 
     {
         TIter NextSp(&leds);
         Led *spot=NULL;
-        while ((spot=(Led*)NextSp()))
-        {
-            const XY dpos(spot->GetX()-star->GetX(), spot->GetY()-star->GetY());
-
+        while ((spot=(Led*)NextSp())) 
+        {
+            const XY dpos(spot->GetX()-(768-star->GetX()), spot->GetY()-star->GetY());
+            
             const Int_t idx = x.GetSize();
-
+            
             x.Set(idx+1);
             y.Set(idx+1);
             mag.Set(idx+1);
-
+            
             x.AddAt(dpos.X(), idx);
             y.AddAt(dpos.Y(), idx);
             mag.AddAt(spot->GetMag()/star->GetMag(), idx);
 
-            if (fout)
+            if (fout) {
+                fout << spot->GetX() << " " 
+                     << spot->GetY()  << " " 
+                     << spot->GetMag()  << " " 
+                     << star->GetX() << " " 
+                     << star->GetY()  << " " 
+                     << star->GetMag()  << " ";
                 fout << x[idx] << " " << y[idx] << " " << mag[idx] << endl;
+            }
         }
-    }
-
-    ZdAz d = TrackingError(x, y, mag);
-
+    }  
+
+    d = TrackingError(x, y, mag);
+    fDZdAz->SetCoordinates(d);
+    
     //
     // Calculated offsets
     //
 
+#ifdef EXPERT
     // round= floor(x+.5)
     cout << "Offset-ZdAz: " << d.Zd()*60 << "' / " << d.Az()*60 << "'" << endl;
     cout << "Offset-ZdAz: " << d.Zd()/360*16384 << " / " << d.Az()/360*16384 << " (SE) " << endl;
+#endif
 
     //
@@ -890 +1102 @@
     ZdAz cpos = fSao->GetZdAz()-d;
     fPZdAz->SetCoordinates(cpos);
-}
-
-void MStarguider::FindStar(FilterLed &f, FilterLed &f2, Ring &center, MTime &t)
+
+    return kTRUE; 
+
+}
+
+ZdAz MStarguider::FindStar(FilterLed &f, FilterLed &f2, Ring &center, MTime &t, Double_t cut, Double_t box, Double_t scalefactor = 1.0)
 {
     // Set search Paremeters (FIXME: Get them from user input!)
-    f.SetCut(3.5);
-    f.SetBox(70);
+    f.SetCut(cut);  // 3.5
+    f.SetBox(box);  // 70
 
     // Try to find Led in this area
@@ -902 +1117 @@
     f.FindStar(leds, (Int_t)center.GetX(), (Int_t)center.GetY());
 
-    // Check wheter star found
+    // Check whether star found
     Led *star = (Led*)leds.At(0);
     if (!star || leds.GetEntries()<1)
-        return;
+        return ZdAz(.0,.0);
 
     cout << "Found star @ " << flush;
@@ -932 +1147 @@
 
     // Convert from Pixel to millimeter (1pix=2.9mm)
-    x *= 2.58427;
-    y *= 2.58427;
+    x *= (2.58427 * scalefactor);
+    y *= (2.58427 * scalefactor);
 
     // Correct for abberation.
@@ -945 +1160 @@
     cout << "STAR-Offset: " << MTime(-1) << " dZd=" << dzd << "d  dAz=" << daz << "d" << endl;
 
+    ZdAz zdaz(dzd,daz);
+
     // Check TPoint data set request
     if (!fTPoint->IsDown())
-        return;
+        return zdaz;
     fTPoint->SetDown(kFALSE);
 
@@ -1011 +1228 @@
         outrep.UnLock("MStarguider::FindStar");
     }
+    
+    return zdaz;
 }
 
@@ -1042 +1261 @@
 }
 
-void MStarguider::ProcessFrame(const unsigned long n, byte *img, struct timeval *tm)
+void MStarguider::ProcessFrame(const unsigned long n, byte *img, 
+                               struct timeval *tm)
 {
     static unsigned long n0 = n;
@@ -1066 +1286 @@
     FilterLed f(img,   768, 576, 2.5); // 2.5
     FilterLed f2(cimg, 768, 576); // former color 0xb0
-
+    
     if (fDisplay->IsEntryChecked(IDM_kStretch))
         f.Stretch();
-
+    
     if (!fWritePictures->IsEntryEnabled(IDM_kStart) &&
         (!(n%fWrtRate) || fWriteType->IsEntryChecked(IDM_kOnce)))
@@ -1075 +1295 @@
         if (fFileType->IsEntryChecked(IDM_kPNG))
             Writer::Png("pix/file", img, tm);
-
+        
         if (fFileType->IsEntryChecked(IDM_kPPM))
             Writer::Ppm("pix/file", img, tm);
-
+        
         if (fWriteType->IsEntryChecked(IDM_kOnce))
             ProcessMessage(MK_MSG(kC_COMMAND, kCM_MENU), IDM_kStop, 0);
     }
-
-    MStarList spots;
+    
+    // Visual Filter, whole FOV
     if (fDisplay->IsEntryChecked(IDM_kFilter))
         f.Execute();
-
+   
+    /* ---------------------------------- 
+    // Visual StarFilter for Starguider
+    if (fDisplay->IsEntryChecked(IDM_kFilterStarg) && !fDisplay->IsEntryChecked(IDM_kStarguider)) {
+      f.SetBox(230);
+      f.AddIgnoreRegion(295,112,384,204);
+      f.Execute(530, 292);
+    }
+    ------------------------------------- */
+
+    // Find Center of Camera for Caos and Tpoints
     Ring center(768/2, 576/2);
     if (fDisplay->IsEntryChecked(IDM_kCaosFilter))
@@ -1095 +1325 @@
         if (fCosy)
             pos = fCosy->GetPointingPos();
-
-        center = fCaos->Run(img, printl, printr, pos, t);
-    }
-
+        center = fCaos->Run(img, printl, printr, pos, t, 50, 3.0);
+    }
+
+    // Find Star at Center---for Tpoint Procedure
     if (fDisplay->IsEntryChecked(IDM_kFindStar))
-        FindStar(f, f2, center, t);
+        ZdAz zdaz = FindStar(f, f2, center, t, 3.5, 70);
 
     byte zimg[kZOOM*kZOOM];
@@ -1111 +1341 @@
     if (fCosy)
     {
-        byte simg[(768/2-1)*(576/2-1)];
-        for (int y=0; y<576/2-1; y++)
-            for (int x=0; x<768/2-1; x++)
-                simg[x+y*(768/2-1)] = ((unsigned int)img[2*x+2*y*768]+img[2*x+2*y*768+1]+img[2*x+2*(y+1)*768]+img[2*x+2*(y+1)*768+1])/4;
-
-        fCosy->GetWin()->GetImage()->DrawImg(simg);
-    }
-
+        byte simg[(768/2-1)*(576/2-1)];
+        for (int y=0; y<576/2-1; y++)
+            for (int x=0; x<768/2-1; x++)
+                simg[x+y*(768/2-1)] = ((unsigned int)img[2*x+2*y*768]+img[2*x+2*y*768+1]+img[2*x+2*(y+1)*768]+img[2*x+2*(y+1)*768+1])/4;        
+        
+        fCosy->GetWin()->GetImage()->DrawImg(simg);
+    }
+
+    // Find Center of Camera in Starfield Camera picture 
+
+    Ring sgcenter(53.2, 293.6); // Center of camera in SG picture [px]
+    ZdAz sgcenterzdaz(0, 0);    // Center of camera in SG picture [deg] 
+                                // (0,0)_deg is at (53.2, 293.6)_px
+    ZdAz star(0, 0);            // Star on curtain in [deg]
+
+    if (fDisplay->IsEntryChecked(IDM_kStargCaosFilter))
+    {    
+        ZdAz pos;
+        if (fCosy)
+            pos = fCosy->GetPointingPos();
+        sgcenter = 
+            fStargCaos->Run(img, kFALSE, kFALSE, pos, t, 30, 3.0); // [px]
+        const Float_t pixsize = atof(fPixSize->GetText()); // [arcsec/px]
+        sgcenterzdaz.Zd((sgcenter.GetY()-293.6) * pixsize /3600 );
+        sgcenterzdaz.Az((sgcenter.GetX()-53.2) * pixsize /3600 ); 
+#ifdef EXPERT
+        cout << "- LEDs imply offset of Zd=" 
+             << sgcenter.GetX()-53.2 << "pix Az=" 
+             << sgcenter.GetY()-293.6<< "pix" << endl;  
+#endif
+        if (fDisplay->IsEntryChecked(IDM_kStargFindStar)) {
+            star = FindStar(f, f2, sgcenter, t, 4.5, 30, 267/161.9); // [deg]
+#ifdef EXPERT
+            cout << "- Star is found to be off Zd=" << star.Zd()*60 << "' Az=" 
+                 << star.Az()*60 << "'" << endl;            
+#endif
+            fSZdAz->SetCoordinates(star); // Misspointing found from Camera
+        }
+    }
+
+    // we calculate the offset given by the three ETH Leds visible to
+    // the guide camera
+    // This is an (inferior, obsolete) alternative to the StarCaosFilter
+    // Led offset;
+    // if (fDisplay->IsEntryChecked(IDM_kStargLEDFilter))       
+    //  fStargLeds->Run(img,offset);
+
+    // Position corresponding to the camera center (53.2, 293.6)
+    Ring skycenter(392, 318);
+    // MStarList spots;
+
+    // we obtain a list of stars in the FOV from the SAO catalog
     if (fDisplay->IsEntryChecked(IDM_kCatalog))
     {
-        MTime time(*tm);
-
-        XY xy = fCRaDec->GetCoordinates();
-        fRaDec->Set(xy.X()*360/24, xy.Y());
-
-        UpdatePosZoom();
-
-        /*
-        if (fDisplay->IsEntryChecked(IDM_kStarguider))
-        {
-            Leds leds;
-            f.Execute(leds);
-
-            cout << "Found: " << leds.GetEntries() << " stars." << endl;
-
-            CalcTrackingError(leds, stars);
-        }
-        */
-
-        // Always call SetMjd first!
-        fSao->SetPointing(time.GetMjd(), *fRaDec);
-        fCZdAz->SetCoordinates(fSao->GetZdAz());
-
-        MStarList stars;
-        fSao->CalcStars(stars);
-        fSao->DrawStars(stars, cimg);
-    }
-
+        MTime time(*tm);
+          
+        XY xy = fCRaDec->GetCoordinates();
+        fRaDec->Set(xy.X()*360/24, xy.Y());
+
+        UpdatePosZoom();
+
+        // Always call SetMjd first!
+        fSao->SetPointing(time.GetMjd(), *fRaDec);
+        fCZdAz->SetCoordinates(fSao->GetZdAz());
+
+        MStarList stars;
+        fSao->SetBox(230); // Region of interest around center
+
+        // very careful: If center of camera cannot be determined
+        // sgcenter jumps to (0,0)  
+        double sgcenteroffsetX = 0.0;
+        double sgcenteroffsetY = 0.0;
+        if ((double)sgcenter.GetX() > 0.0 && (double)sgcenter.GetY() > 0.0) {
+            sgcenteroffsetX = sgcenter.GetX()-53.2;
+            sgcenteroffsetY = sgcenter.GetY()-293.6;
+        }
+
+        // we obtain stars in the effective star FOV and draw them.
+        // coordinates are video frame coords.
+        // We determine the ideal starfield using camera sagging info
+        // from the LEDs
+
+        //cout << sgcenteroffsetX << " " << sgcenteroffsetY << endl;
+
+        fSao->CalcStars(stars, 530, 292, 
+                        -8+2-3+sgcenteroffsetX,  //x: star<spot =>subs
+                        31.5-3+sgcenteroffsetY);   //y: star<spot =>subs?
+
+        fSao->DrawStars(stars, cimg);
+
+        // There are two corrections to the misspointing
+        // - Sagging of the camera as measured with the LEDs
+        // - Star not ideally centered on MAGIC Camera
+
+        // Next we evaluate the offset given by the LEDs. This we obtain
+        // in Zd/Az and add it to the tracking error.
+       
+        if (fDisplay->IsEntryChecked(IDM_kStarguider))
+        {
+            Leds spots;
+            f.SetBox(230);
+            double bright;
+            f.ExecuteAndMark(spots, 530, 292, bright);
+            MString txt;
+            txt.Print("Sky Brightness: %.1f", bright);
+            fSkyBright->SetText(txt);
+
+            ULong_t color;
+            gClient->GetColorByName("Green", color);    
+            if (bright> 60) gClient->GetColorByName("Yellow", color);    
+            if (bright> 85) gClient->GetColorByName("Orange", color);    
+            if (bright> 95) gClient->GetColorByName("Red", color);    
+            fSkyBright->SetBackgroundColor(color);
+           
+            bool rc = CalcTrackingError(spots, stars, fD, t);
+
+            if (rc && (bright <= 1.75* fLastBright) && (bright < 110)) {
+              fStatus = MDriveCom::kMonitoring;
+            } else {
+              fStatus = MDriveCom::kError;
+            }
+            
+            if (fCosy)
+                fPos = fCosy->GetPointingPos();   
+         
+            if (fDisplay->IsEntryChecked(IDM_kStargAnalysis)) 
+                fStargHistograms->Fill(spots, stars, fD, 
+                   fSao->GetZdAz(), sgcenter, sgcenterzdaz,
+                   star, bright, fPos, t);
+
+            fLastBright = bright;
+
+        } //kStarguider
+
+        f2.DrawCircle(skycenter, 2.0, 0x0a);
+        
+        f2.DrawCircle(skycenter, 7.4, 0x0a); //0.1deg
+
+        f2.DrawCircle(skycenter, 2.06*.5*74.0, 0x0a);
+        f2.DrawCircle(skycenter, 2.32*.5*74.0, 0x0a);
+        f2.DrawCircle(skycenter, 3.50*.5*74.0, 0x0a);
+        f2.DrawCircle(skycenter, 3.84*.5*74.0, 0x0a);
+
+    } //CalcStars
+
+    if (fCosy) {
+        MDriveCom &com = *fCosy->GetDriveCom();
+        com.SendStargReport(fStatus, fD);    // Report
+    }
+
+    // Draw Circles around center of Camera
     if (fDisplay->IsEntryChecked(IDM_kCaosFilter))
     {
         f2.DrawCircle(center, 0x0a);
-        f2.DrawCircle(center,   5.0, fDisplay->IsEntryChecked(IDM_kFindStar)?3:0xb0);
+        f2.DrawCircle(center,   5.0, 
+                      fDisplay->IsEntryChecked(IDM_kFindStar)?3:0xb0);
         f2.DrawCircle(center, 115.0, 0x0a);
         f2.DrawCircle(center, 230.0, 0x0a);
@@ -1158 +1502 @@
     }
 
-    if (fDisplay->IsEntryChecked(IDM_kCatalog))
-    {
-        fSao->PaintImg(cimg, 768, 576);
-
-        const float r = 60*60/fSao->GetPixSize();
-
-        f2.DrawCircle(0.5*r, 0x0a);
-        f2.DrawCircle(1.0*r, 0x0a);
-        f2.DrawCircle(1.5*r, 0x0a);
-    }
+    if (fDisplay->IsEntryChecked(IDM_kStargCaosFilter))
+    {
+        f2.DrawCircle(sgcenter, 0x0a);
+        f2.DrawCircle(sgcenter,   5.0, 
+                      fDisplay->IsEntryChecked(IDM_kFindStar)?3:0xb0);
+    }
+
+//      if (fDisplay->IsEntryChecked(IDM_kCatalog))
+//      {
+//          fSao->PaintImg(cimg, 768, 576);
+//          const float r = 60*60/fSao->GetPixSize();
+//      f2.DrawCircle(0.5*r, 0x0a);
+//      f2.DrawCircle(1.0*r, 0x0a);
+//      f2.DrawCircle(1.5*r, 0x0a);
+//      }
 
     if (fDisplay->IsEntryChecked(IDM_kCaosFilter) ||
@@ -1183 +1532 @@
     {
         // FIXME: Necessary?
-        fSao->Now();
+        fSao->Now();
         AltAz aa = fSao->CalcAltAzFromPix(fDx, fDy)*kRad2Deg;
-
         if (aa.Az()<0)
             aa.Az(aa.Az()+360);
-
         txt.Print("%.1fd/%.1fd (%d, %d)", -aa.Alt(), aa.Az()-180, fDx, fDy);
     }
     else
         txt.Print("(%d, %d)", fDx, fDy);
-
     fPosZoom->SetText(txt);
 }
@@ -1221 +1567 @@
     return kTRUE;
 }
+
+void MStarguider::Print(TString &str, Double_t deg) const
+{
+    Char_t sgn;
+    UShort_t d, m, s;
+
+    MAstro::Deg2Dms(deg, sgn, d, m, s);
+
+    MString txt;
+    str += txt.Print("%c %03d %02d %03d ", sgn, d, m, s);
+}

trunk/MagicSoft/Cosy/main/MStarguider.h

@@ -1 +1 @@
 #ifndef COSY_MStarguider
 #define COSY_MStarguider
-
-#ifndef ROOT_TGFrame
-#include <TGFrame.h>
-#endif
 
 #include "PixClient.h"
@@ -23 +19 @@
 class TGLabel;
 class TGButton;
+class TString;
 
 class TTimer;
@@ -39 +36 @@
 class MCosy;
 class MCaos;
+// class MStargLeds;
+class MStargHistograms;
+class MGStarg;
 class FilterLed;
 class Ring;
@@ -54 +54 @@
     MGImage       *fImage;
     MGImage       *fZoomImage;
+
+    MGStarg       *fGStarg;
 
     MGPopupMenu   *fDisplay;
@@ -74 +76 @@
 
     MGCoordinates *fPZdAz;
+    MGCoordinates *fDZdAz;
+    MGCoordinates *fSZdAz;
 
     TGTextEntry   *fPixSize;
@@ -80 +84 @@
     TGLabel       *fFps;
     TGLabel       *fPosZoom;
+    TGLabel       *fSkyBright;
 
     TGButton      *fTPoint;
 
+    ZdAz          fPos;
+    ZdAz          fD;
+    
     StarCatalog   *fSao;
     MCosy         *fCosy;
     MCaos         *fCaos;
-
+    MCaos         *fStargCaos;
+    //    MStargLeds    *fStargLeds;
+    MStargHistograms *fStargHistograms;
+    
     RaDec *fRaDec;
 
@@ -100 +111 @@
     int  fWrtRate;
 
+    UInt_t fStatus;
+    Double_t fLastBright;
+
     void SetPixSize(const double pixsize);
     void Toggle(MGPopupMenu *p, UInt_t id);
     //void GetCoordinates();
-    void CalcTrackingError(Leds &, MStarList &);
+    bool CalcTrackingError(Leds &, MStarList &, ZdAz &, MTime &);
+    //void CalcTrackingError(Leds &, MStarList &);
     ZdAz TrackingError(TArrayF &alt, TArrayF &az, TArrayF &mag) const;
     bool Interpolate(const unsigned long n, byte *img) const;
-    void FindStar(FilterLed &f, FilterLed &f2, Ring &center, MTime &t);
+    ZdAz FindStar(FilterLed &f, FilterLed &f2, Ring &center, MTime &t, 
+                  Double_t cut, Double_t box, Double_t scalefactor);
 
     //void InitHists();
@@ -145 +161 @@
     void ProcessFrame(const unsigned long n, byte *img, struct timeval *tm);
 
+    void Print(TString &str, Double_t deg) const;
+
     ClassDef(MStarguider, 0)
 };
 
 #endif
+
+

trunk/MagicSoft/Cosy/main/MainLinkDef.h

@@ -7 +7 @@
 #pragma link C++ class MCosy;
 #pragma link C++ class MStarguider+;
+#pragma link C++ class MStargHistograms+;
 
 #pragma link C++ class MBending;

trunk/MagicSoft/Cosy/main/Makefile

@@ -34 +34 @@
 SRCFILES = MBending.cc \
            MStarguider.cc \
+           MStargHistograms.cc \
            MPointing.cc \
            MTracking.cc \

trunk/MagicSoft/Cosy/prepos_magic.txt

@@ -1 @@
-100.045      -8.869999999 Camera Access
+98.30000000  -10.0133333  Camera Access
 61.23817667   0           Celestial Pole
-94.125       -9.23        Park
+93.91666667  -10.0133333  Park
 95.58527778 151.018055556 Roque Lamp
 4             0           Zenith

trunk/MagicSoft/Cosy/starg.cc

@@ -10 +10 @@
 //VoidFuncPtr_t initfuncs[] = { InitGui, 0 };
 
-TROOT root("GUI", "GUI test environement"); //, initfuncs);
+TROOT root("GUI", "GUI test environment"); //, initfuncs);
 
 int main(int argc, char **argv)

trunk/MagicSoft/Cosy/stars.txt

@@ -4 +4 @@
 12 56 11  -05 47 22  3C279 (17.75)
 12 54 02   55 57 35  Alioth (1.77)
+19 30 43   27 57 34  Albiero (3.08)
 00 08 23   29 05 26  Alpha Andromedae (2.1)
 02 07 10   23 27 45  Alpha Aries (2.00)
@@ -33 +34 @@
 05 55 10   07 24 25  Betelgeuse (0.5)
 22 02 43   42 16 40  BL-Lac (14.5)
-05 15 41   45 59 53  Capella (0.08)
+05 16 41   45 59 53  Capella (0.08)
 00 09 11   59 08 59  Caph (2.27)
 12 59 49   27 58 50  Coma Cluster (10.70)
@@ -69 +70 @@
 06 33 54   17 46 48  Geminga
 19 30 42   51 43 47  Iota2 Cygni (3.8)
+22 07 00   25 20 42  Iota Pegasi (3.49)
 19 17 06   53 22 07  Kappa Cygni (3.9)
 18 24 10  -34 23 05  Kaus Australis (1.85)
@@ -88 +90 @@
 15 02 22  -41 53 48  SN-1006
 13 25 13  -11 09 41  Spica (0.98)
+19 46 15   10 36 48  Tarazed (2.72)
 20 11 18  -00 49 17  Theta Aquilae (3.2)
 17 37 19  -42 59 52  Theta Scorpionis (1.87)
+15 44 16    6 25 32  Unukalhay (2.65)
 18 36 56   38 47 01  Vega (0.03)
 19 05 25   13 51 48  Zeta Aquilae (3.0)

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.cc

@@ -90 +90 @@
 }
 
-bool MCeCoCom::Send(const char *cmd, const char *str)
+bool MCeCoCom::Send(const char *cmd, const char *str, bool force=kFALSE)
 {
     MTime t;
@@ -113 +113 @@
              str);
 
-    const bool rc = MTcpIpIO::Send(msg);
+    const bool rc = MTcpIpIO::Send(msg, force);
     fComStat = rc ? kNoCmdReceived : kComProblem;
     return rc;

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h

@@ -49 +49 @@
     }
 
-    bool Send(const char *cmd, const char *str);
+    bool Send(const char *cmd, const char *str, bool force);
     void SetStatus(Byte_t s) { fStatus=s; }
 

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -182 +182 @@
     str += txt.Print("%08.3f", er.Az());
 
-    return Send("DRIVE-REPORT", str);
+    return Send("DRIVE-REPORT", str, kFALSE);
 }
 
 bool MDriveCom::SendStatus(const char *stat)
 {
-    return Send("DRIVE-STATUS", stat);
-}
+    return Send("DRIVE-STATUS", stat, kFALSE);
+}
+
+bool MDriveCom::SendStargReport(UInt_t stat, ZdAz miss)
+{
+   
+    // miss [rad]
+    const MTime t(-1);
+
+    miss *= kRad2Deg;
+
+    // Set status flag
+    if (stat&kError)
+        SetStatus(0);
+    if (stat&kStopped)
+        SetStatus(1);
+    if (stat&kStandby)
+        SetStatus(2);
+    if (stat&kMonitoring)
+        SetStatus(4);
+    
+    MString txt;
+
+    TString str;
+    str += txt.Print("%05.3f ", miss.Zd());
+    str += txt.Print("%05.3f", miss.Az());
+    
+    return Send("STARG-REPORT", str, kTRUE);
+
+}
+
+
+
+
+

trunk/MagicSoft/Cosy/tcpip/MDriveCom.h

@@ -31 +31 @@
         kTracking = 0x04,
         kStopping = 0x08,
-        kStopped  = 0x10
+        kStopped  = 0x10,
+        kStandby  = 0x20,
+        kMonitoring = 0x40
     };
-
+  
     MDriveCom(MsgQueue *q, MLog &out=gLog) : MCeCoCom("DRIVE-REPORT", out), fQueue(q) {}
 
     bool SendReport(UInt_t stat, RaDec rd, ZdAz so, ZdAz is, ZdAz er);
+    bool SendStargReport(UInt_t stat, ZdAz miss);
     bool SendStatus(const char *stat);
 };
 
 #endif
+
+
+
+
+
+
+
+
+
+
+

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

@@ -67 +67 @@
 }
 
-bool MTcpIpIO::Send(const char *msg)
-{
+bool MTcpIpIO::Send(const char *msg, bool force=kFALSE)
+{
+
     const MTime t(-1);
 
-    if ((double)t-(double)fTime<0.001*fSendInterval)
-        return true;
+    if ((double)t-(double)fTime<0.001*fSendInterval && !force) 
+          return true;
+    
 
     if (lout.Lock("MTcpIpIO::Send"))
@@ -103 +105 @@
     cout << "Tx: " << msg << flush;
 #endif
+
     return true;
 }

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.h

@@ -32 +32 @@
     ~MTcpIpIO();
 
-    virtual bool Send(const char *msg);
+    virtual bool Send(const char *msg, bool force);
     virtual bool InterpreteStr(TString str);
 

trunk/MagicSoft/Cosy/videodev/FilterLed.cc

@@ -227 +227 @@
 
     Execute(leds, xc, yc);
-
+ 
     // Mark Stars in image
     for (int i=first; i<leds.GetEntriesFast(); i++)
@@ -233 +233 @@
 }
 
+
+void FilterLed::ExecuteAndMark(Leds &leds, int xc, int yc, double &bright) const
+{
+    const Int_t first = leds.GetEntriesFast();
+
+    Execute(leds, xc, yc, bright);
+ 
+    // Mark Stars in image
+    for (int i=first; i<leds.GetEntriesFast(); i++)
+        MarkPoint(leds(i));
+}
+
 void FilterLed::Execute(int xc, int yc) const
 {
@@ -240 +252 @@
 
 void FilterLed::Execute(Leds &leds, int xc, int yc) const
+{
+    double bright;
+    Execute(leds, xc, yc, bright);
+}
+
+
+void FilterLed::Execute(Leds &leds, int xc, int yc, double &bright) const
 {
     int x0 = xc-fBox;
@@ -269 +288 @@
     sq  /= wx*hy;
 
+    bright=sum;
+
+    
     // 254 because b<=max and not b<max
     const double sdev = sqrt(sq-sum*sum);
@@ -345 +367 @@
 
     RemoveTwinsInterpol(leds, first, 5);
+    
+   
 }
 

trunk/MagicSoft/Cosy/videodev/FilterLed.h

@@ -22 +22 @@
     void GetMinMax(const int offset, byte *min, byte *max) const;
     int  GetMeanPosition(const int x, const int y, const int box) const;
-    int  GetMeanPosition(const int x, const int y, const int box, float &mx, float &my, unsigned int &sum) const;
+    int  GetMeanPosition(const int x, const int y, const int box, 
+                         float &mx, float &my, unsigned int &sum) const;
     void RemoveTwinsInterpol(Leds &leds, Int_t first, Double_t radius) const;
     void DrawBox(const int x1, const int y1,
@@ -30 +31 @@
 public:
     FilterLed(byte *img, int w, int h, double cut=2.5)
-        : fImg(img), fW(w), fH(h), fBox(w>h?w:h), fCut(cut)
+      : fImg(img), fW(w), fH(h), fBox(w>h?w:h), fCut(cut)
     {
     }
 
     FilterLed(byte *img, int w, int h, int box, double cut=2.5)
-        : fImg(img), fW(w), fH(h), fBox(box), fCut(cut)
+      : fImg(img), fW(w), fH(h), fBox(box), fCut(cut)
     {
     }
 
     void SetBox(int box)   { fBox = box; }
-    void SetCut(float cut) { fCut = cut; }
-
+    void SetCut(float cut) { fCut = cut; } 
     void FindStar(Leds &leds, int xc, int yc) const;
-
+    void Execute(Leds &leds, int xc, int yc, double &bright) const;
     void Execute(Leds &leds, int xc, int yc) const;
     void Execute(Leds &leds) const { Execute(leds, fW/2, fH/2); }
     void ExecuteAndMark(Leds &leds, int xc, int yc) const;
+    void ExecuteAndMark(Leds &leds, int xc, int yc, double &bright) const;
     void ExecuteAndMark(Leds &leds) const { ExecuteAndMark(leds, fW/2, fH/2); }
     void Execute(int xc, int yc) const;