Changeset 1802

Timestamp:

03/02/03 16:55:47 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (3 diffs)
• caos/Led.cc (modified) (2 diffs)
• caos/Led.h (modified) (1 diff)
• caos/Leds.cc (modified) (2 diffs)
• caos/Leds.h (modified) (2 diffs)
• caos/Ring.cc (modified) (4 diffs)
• caos/Ring.h (modified) (1 diff)
• caos/Rings.cc (modified) (4 diffs)
• caos/Rings.h (modified) (1 diff)
• gui/GuiLinkDef.h (modified) (1 diff)
• gui/MGPngReader.cc (added)
• gui/MGPngReader.h (added)
• gui/MGStarguider.cc (modified) (3 diffs)
• gui/MGStarguider.h (modified) (2 diffs)
• gui/Makefile (modified) (2 diffs)
• starg.cc (modified) (2 diffs)
• videodev/Camera.cc (modified) (4 diffs)
• videodev/Camera.h (modified) (4 diffs)
• videodev/CaosFilter.cc (added)
• videodev/Makefile (modified) (2 diffs)
• videodev/PixClient.cc (added)
• videodev/PixClient.h (added)
• videodev/VideodevLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2003/03/02 - Daniela Dorner, Thomas Bretz (LaPalma):
+
+  * Makefile: 
+     - removed dummy
+     - exchnged caos, candrv
+     - removed MCint.o
+     - added cosy.so
+ 
+   * starg.cc:
+     - echanged to use png reading mode
+   
+   * caos/Led.[h,cc], caos/Leds.[h,cc], caos/Ring.[h,cc], 
+     caos/Ring.[h,cc]:
+     - added Print
+
+   * caos/Led.h:
+     - added compare
+     - added issortable
+
+   * caos/Ring.cc:
+     - changed output
+
+   * caos/Rings.cc:
+     - fixed some minor bugs
+
+   * gui/GuiLinkDef.h, gui/Makefile;
+     - added MGPngReader.[h,cc]
+
+   * gui/MGPngReader.[h,cc]:
+     - added
+     
+   * gui/MGStarguider.cc:
+     - release grabbed mouse
+     - removed ExitLoop
+     
+   * gui/MGStarguider.h:
+     - changed derivement from Camera to PixClient
+
+   * videodev/Camera.[h,cc]:
+     - changed to use PixClient
+   
+   * videodev/Makefile, videodev/VideodevLinkDef.h:
+     - added PixClient
+
+   * videodev/PixClient.[h,cc]
+     - added 
+
+
+
  2003/02/27 - Thomas Bretz (LaPalma):
 

trunk/MagicSoft/Cosy/Makefile

@@ -20 +20 @@
 #
 
-PROGRAMS = testse starg cosy dummy
-SOLIB    = 
+PROGRAMS = testse cosy starg
+SOLIB    = cosy.so
 CINT     = M
 INCLUDES = -I. -Imain  -Ibase -Icandrv -Iincl -Igui -Ivideodev -Icatalog -Idevdrv
@@ -40 +40 @@
         main     \
         gui      \
-        caos     \
-        candrv   \
         catalog  \
         videodev \
         devdrv   \
+        candrv   \
+        caos     \
         base     \
         slalib
@@ -75 +75 @@
         $(CXX) $(CXXFLAGS) $(LIBS) $(OBJS) $@.o  $(MARS_LIB) $(ROOTGLIBS) -o $@
 
-$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) MCint.o
+$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) 
         @echo " Linking $(SOLIB) ..."
         $(CXX) -shared $(CXXFLAGS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@

trunk/MagicSoft/Cosy/caos/Led.cc

@@ -1 +1 @@
 #include "Led.h"
 
+#include <iostream.h>
 #include <TMath.h>
 
@@ -11 +12 @@
     fPhi = TMath::ATan2(fY-ring.GetY(), fX-ring.GetX())*180/TMath::Pi();
 }
+
+void Led::Print(Option_t *o=NULL) const
+{
+    cout << "Led: ";
+    cout << "x="   << fX   << "+-" << fDx   << ", ";
+    cout << "y="   << fY   << "+-" << fDy   << ", ";
+    cout << "phi=" << fPhi << "+-" << fDphi << ", ";
+    cout << "mag=" << fMag << endl;
+}

trunk/MagicSoft/Cosy/caos/Led.h

@@ -27 +27 @@
     }
 
-    Double_t GetX() const   { return fX; }
-    Double_t GetY() const   { return fY; }
-    Double_t GetDx() const  { return fDx; }
-    Double_t GetDy() const  { return fDy; }
-    Double_t GetMag() const { return fMag; }
+    Int_t Compare(const TObject *obj) const
+    {
+        const Led *const l = (Led*)obj;
+
+        if (fPhi<l->fPhi)
+            return -1;
+
+        if (fPhi>l->fPhi)
+            return 1;
+
+        return 0;
+    }
+
+    Double_t GetX() const    { return fX; }
+    Double_t GetY() const    { return fY; }
+    Double_t GetDx() const   { return fDx; }
+    Double_t GetDy() const   { return fDy; }
+    Double_t GetPhi() const  { return fPhi; }
+    Double_t GetDphi() const { return fDphi; }
+    Double_t GetMag() const  { return fMag; }
+
+        Bool_t IsSortable() const { return kTRUE; }
 
     void CalcPhi(const Ring &ring);
+
+    void Print(Option_t *o=NULL) const;
 
     ClassDef(Led, 1)

trunk/MagicSoft/Cosy/caos/Leds.cc

@@ -1 +1 @@
 #include "Leds.h"
+
+#include <iostream.h>
 
 #include "Led.h"
@@ -9 +11 @@
     new ((*this)[i]) Led(x, y, dx, dy, mag);
 }
+
+void Leds::Print(Option_t *o=NULL) const
+{
+    cout << "Number of Leds: " << GetEntries() << endl;
+    TClonesArray::Print();
+}

trunk/MagicSoft/Cosy/caos/Leds.h

@@ -10 +10 @@
 class Leds : public TClonesArray
 {
-private:
 public:
     Leds() : TClonesArray("Led", 1) {}
@@ -27 +26 @@
     Led &operator()(int i) { return *(Led*)((*(Leds*)this)[i]); }
 
+    void Print(Option_t *o=NULL) const;
+
     ClassDef(Leds, 1)
 };

trunk/MagicSoft/Cosy/caos/Ring.cc

@@ -20 +20 @@
         if (h1==0)
         {
-                cout << "h1==0" <<endl;
-                return kFALSE;
+            cout << "h1==0" <<endl;
+            return kFALSE;
         }
     }
@@ -38 +38 @@
     }
 
-    Float_t w1 = leds(i).GetX() - leds(j).GetX();
-    Float_t w2 = leds(j).GetX() - leds(k).GetX();
+    const Float_t w1 = leds(i).GetX() - leds(j).GetX();
+    const Float_t w2 = leds(j).GetX() - leds(k).GetX();
 
-    Float_t m1 = -w1/h1;
-    Float_t m2 = -w2/h2;
+    const Float_t m1 = -w1/h1;
+    const Float_t m2 = -w2/h2;
 
     if (m2-m1==0)
     {
-        cout << "m2-m1==0" << endl;
+        cout << "All three points in a row! (m2-m1==0)" << endl;
         return kFALSE;
     }
@@ -66 +66 @@
     fR = 0;
 
+    fDx=0;
+    fDy=0;
+    fDr=0;
+
+    if (n<1)
+        return;
+
     for (int i=0; i<n; i++)
     {
-        const Ring &ring = *(Ring*)((Rings&)rings)[i];
+        const Ring &ring = rings(i);
 
         fX += ring.GetX();
@@ -79 +86 @@
     fR /= n;
 
+    if (n<2)
+        return;
+
     //
     // deviation of x- and y coordinate and radius
     //
-    Float_t sumx=0;
-    Float_t sumy=0;
-    Float_t sumr=0;
-
     for (int i=0; i<n; i++)
     {
-        const Ring &ring = *(Ring*)((Rings&)rings)[i];
+        const Ring &ring = rings(i);
 
-        sumx += sqr(ring.GetX()-fX);
-        sumy += sqr(ring.GetY()-fY);
-        sumr += sqr(ring.GetR()-fR);
+        fDx += sqr(ring.GetX()-fX);
+        fDy += sqr(ring.GetY()-fY);
+        fDr += sqr(ring.GetR()-fR);
     }
 
-        fDx=sqrt(sumx)/(n-1);
-        fDy=sqrt(sumy)/(n-1);
-        fDr=sqrt(sumr)/(n-1);
-
+    fDx=sqrt(fDx)/(n-1);
+    fDy=sqrt(fDy)/(n-1);
+    fDr=sqrt(fDr)/(n-1);
 }
 
+void Ring::Print(Option_t *o=NULL) const
+{
+    cout << "Ring: ";
+    cout << "x="   << fX   << "+-" << fDx   << ", ";
+    cout << "y="   << fY   << "+-" << fDy   << ", ";
+    cout << "r="   << fR   << "+-" << fDr   << ", ";
+    cout << "phi=" << fPhi << "+-" << fDphi << endl;
+}
+

trunk/MagicSoft/Cosy/caos/Ring.h

@@ -41 +41 @@
     void InterpolCenters(const Rings &rings);
 
+    void Print(Option_t *o=NULL) const;
+
     ClassDef(Ring, 1)
 };

trunk/MagicSoft/Cosy/caos/Rings.cc

@@ -1 +1 @@
 #include "Rings.h"
+
+#include <iostream.h>
 
 #include "Led.h"
@@ -6 +8 @@
 ClassImp(Rings);
 
-Int_t Rings::CalcCenters(const Leds &leds)
+void Rings::CalcCenters(const Leds &leds)
 {
     int nPoints = leds.GetEntries();
@@ -15 +17 @@
             for (int k=j+1; k<nPoints; k++)
             {
-                Ring &ring = *(Ring*)(*this)[n];
+                Ring &ring = *new ((*this)[n]) Ring;
 
-                ring.CalcCenter(leds, i, j, k);
+                if (!ring.CalcCenter(leds, i, j, k))
+                {
+                    RemoveAt(n);
+                    continue;
+                }
 
                 n++;
             }
-    return n;
+
+    Expand(n);
 }
 
@@ -31 +38 @@
 
     //
-    // angles v and relative angle w
+    // angles v
     //
-    for (int j=0; j<leds.GetEntries(); j++)
+    const int n=leds.GetEntries();
+
+    for (int j=0; j<n; j++)
         leds(j).CalcPhi(fCenter);
 }
+
+void Rings::Print(Option_t *o=NULL) const
+{
+    cout << "Number of Rings: " << GetEntries() << endl;
+    TClonesArray::Print();
+    cout << "Center: " << endl;
+    fCenter.Print();
+}

trunk/MagicSoft/Cosy/caos/Rings.h

@@ -17 +17 @@
     Ring fCenter;
 
-    Int_t CalcCenters(const Leds &leds);
+    void CalcCenters(const Leds &leds);
 
 public:
     Rings() : TClonesArray("Ring", 1) {}
 
-    //
-    //  rings.CalcRings(leds);
-    //
     void CalcRings(Leds &leds);
+
+    void Print(Option_t *o=NULL) const;
+
+    const Ring &operator()(int i) const { return *(Ring*)((*(Rings*)this)[i]); }
+    Ring &operator()(int i) { return *(Ring*)((*(Rings*)this)[i]); }
+
+    const Ring &GetCenter() const { return fCenter; }
 
     ClassDef(Rings, 1)

trunk/MagicSoft/Cosy/gui/GuiLinkDef.h

@@ -19 +19 @@
 #pragma link C++ class MGCosy+;
 #pragma link C++ class MGStarguider+;
+#pragma link C++ class MGPngReader+;
 
 #endif

trunk/MagicSoft/Cosy/gui/MGStarguider.cc

@@ -73 +73 @@
 
 MGStarguider::MGStarguider(MObservatory::LocationName_t key)
-: Camera(), TGMainFrame(gClient->GetRoot(), 768, 700), fObservatory(key), fDx((768-kZOOM)/2), fDy((512-kZOOM)/2)
-{
-    gVirtualX->GrabButton(fId, kButton2, /*kButtonPressMask|kButtonReleaseMask|*/kNone, kNone, kNone, kNone);
+: TGMainFrame(gClient->GetRoot(), 768, 700), fObservatory(key), fDx((768-kZOOM)/2), fDy((512-kZOOM)/2)
+{
+    gVirtualX->GrabButton(fId, kButton2, 0, 0, 0, 0, kTRUE);
 
 
@@ -233 +233 @@
 MGStarguider::~MGStarguider()
 {
+    gVirtualX->GrabButton(0, kButton2, 0, 0, 0, 0, kFALSE);
+
     fTimer->TurnOff();
     delete fTimer;
@@ -252 +254 @@
     cout << "EventDisplay::CloseWindow: Exit Application Loop." << endl;
 
-    ExitLoop();
+    /*ExitLoop();*/
+    //cout << "FIXME: ExitLoop not called!!!!!!" << endl;
 
     gSystem->ExitLoop();

trunk/MagicSoft/Cosy/gui/MGStarguider.h

@@ -5 +5 @@
 #include <TGFrame.h>
 #endif
-#ifndef CAMERA_H
-#include "Camera.h"
-#endif
+#include "PixClient.h"
 
 #include "MGList.h"
@@ -31 +29 @@
 class MStarList;
 
-class MGStarguider : public Camera, public TGMainFrame
+class MGStarguider : public PixClient, public TGMainFrame
 {
 private:

trunk/MagicSoft/Cosy/gui/Makefile

@@ -21 +21 @@
 
 INCLUDES = -I. -I.. -I../base -I../slalib -I../candrv -I../incl \
-           -I../catalog -I../videodev -I../main
+           -I../catalog -I../videodev -I../main -I../caos
 
 # @code 
@@ -40 +40 @@
            MGVelocity.cc \
            MGStarguider.cc \
-           MGSkyPosition.cc
+           MGPngReader.cc \
+           MGSkyPosition.cc \
+           MGMenu.cc
 
 SRCS        = $(SRCFILES)

trunk/MagicSoft/Cosy/starg.cc

@@ -1 @@
-#include <iostream.h>
-
 #include <TROOT.h>
 #include <TApplication.h>
 
+#include <iostream.h>
+
 #include "MGStarguider.h"
+#include "MGPngReader.h"
+#include "Camera.h"
+#include "PngReader.h"
+#include "PixClient.h"
 
 /* ---------------------------------------------------------------------- */
@@ -16 +20 @@
     TApplication *app=new TApplication("Starguider", &argc, argv);
 
-    MGStarguider starg(MObservatory::kMagic1);
+    Bool_t dummy = kFALSE;
 
-    starg.Loop(0);
+    for (int i=0; i<argc; i++)
+    {
+        TString arg(argv[i]);
+        if (arg=="-d")
+            dummy = kTRUE;
+    }
 
-    app->Run(kTRUE);
+    PixClient *client=new MGPngReader(MObservatory::kMagic1);
+
+    if (dummy)
+    {
+        cout << " --> Starting in dummy-mode. <--" << endl;
+        PngReader *read=new PngReader(*client);
+        app->Run(kTRUE);
+        read->ExitLoop();
+        delete read;
+        //        delete client;
+    }
+    else
+    {
+        cout << " --> Starting in real-mode. <--" << endl;
+        //PixClient *client=new MGStarguider(MObservatory::kMagic1);
+        Camera *cam = new Camera(*client);
+        cam->Loop(0);
+        app->Run(kTRUE);
+        cam->ExitLoop();
+        delete cam;
+        //        delete client;
+    }
+
+    delete client;
+
+
+    cout << "Application end...." << endl;
 
     cout << "Exit." << endl;

trunk/MagicSoft/Cosy/videodev/Camera.cc

@@ -102 +102 @@
 }
 
-Camera::Camera() : fd(-1), iBufferSize(0)
+Camera::Camera(PixClient &client) : fd(-1), iBufferSize(0), fClient(client)
 {
     cout << "Starting thread..." << flush;
@@ -192 +192 @@
 
 
-void Camera::ProcessFrame(const unsigned long n, byte *img,
-                          struct timeval *tm)
-{
-    cout << "Img: " << n << "  " << (void*)img << endl;
-}
-
 void *Camera::MapThread(void *arg)
 {
@@ -251 +245 @@
                 break;
 
-            ProcessFrame(i, (byte*)fImg, &fTime);
+            fClient.ProcessFrame(i, (byte*)fImg, &fTime);
             i++;
         }
@@ -258 +252 @@
         {
             LoopStep(i);
-            ProcessFrame(i, (byte*)fImg, &fTime);
+            fClient.ProcessFrame(i, (byte*)fImg, &fTime);
             i++;
         }
 
         LoopStep(i);
-        ProcessFrame(i, (byte*)fImg, &fTime);
+        fClient.ProcessFrame(i, (byte*)fImg, &fTime);
         i++;
 

trunk/MagicSoft/Cosy/videodev/Camera.h

@@ -14 +14 @@
 #endif
 
-
-typedef unsigned char byte;
+#include "PixClient.h"
 
 class Camera
@@ -51 +50 @@
     pthread_cond_t  fCond;
 
+    PixClient &fClient;
+
     //
     // Hardware dependant functions
@@ -74 +75 @@
 
 public:
-    Camera();
+    Camera(PixClient &client);
     virtual ~Camera();
 
@@ -96 +97 @@
     // Execution of one frame - this function may be overloaded!
     //
-    virtual void ProcessFrame(const unsigned long n,
-                              byte *img, struct timeval *tm);
+    //virtual void ProcessFrame(const unsigned long n,
+    //                          byte *img, struct timeval *tm);
 
     //

trunk/MagicSoft/Cosy/videodev/Makefile

@@ -20 +20 @@
 # @endcode 
 
-INCLUDES = -I. -I.. -I../incl -I../base -I/usr/X11R6/include
+INCLUDES = -I. -I.. -I../incl -I../base -I../caos -I/usr/X11R6/include
 
 # @code 
@@ -32 +32 @@
 
 SRCFILES = Camera.cc \
+           PngReader.cc \
+           PixClient.cc \
            Filter.cc \
            Filter2.cc \
+           CaosFilter.cc \
            Writer.cc 
 

trunk/MagicSoft/Cosy/videodev/VideodevLinkDef.h

@@ -8 +8 @@
 #pragma link C++ class Filter+;
 #pragma link C++ class Filter2+;
+#pragma link C++ class CaosFilter+;
 
 #pragma link C++ class Camera+;
+#pragma link C++ class PngReader+;
 
 #endif