Changeset 1815 for trunk/MagicSoft

Timestamp:

03/11/03 18:28:04 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (2 diffs)
• caos/Leds.h (modified) (1 diff)
• caos/Ring.cc (modified) (3 diffs)
• caos/Rings.cc (modified) (2 diffs)
• caos/Rings.h (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
  2003/03/11 - Daniela Dorner, Thomas Bretz:
- 
+
+   * .cosyrc_magic, .cosyrc_model:
+     - added
+   
+   * caos/Leds.h, caos/Rings.h:
+     - changed from operator[] to At()
+   
+   * caos/Ring.cc:
+     - changed Floats to Doubles
+    
+   * caos/Rings.cc:
+     - replaced Expand by Clear
+
    * base/MStar.h:
      - added Compare
@@ -47 +59 @@
 
  2003/03/02 - Daniela Dorner, Thomas Bretz (LaPalma):
+
+   * tpoint/tpointfit.C:
+     - added
+   
+   * main/MBending.[h,cc]:
+     - adapted to Magic bending model
+
+   * candrv/nodedrv.cc:
+     - some changes to the output
+  
+   * candrv/vmodican.cc:
+     - minor changes
+  
+   * devdrv/macs.[h,cc]:
+     - implemented 
+     - removed guarding
+     - removed motor off
+    
+   * devdrv/shaftencoder.cc:
+     - removed Gaurding
+     
+   * gui/MGEmbeddedCanvas.[h,cc]:
+     - added overloads for Resize
+   
+   * gui/MGSkyPosition.[h,cc]:
+     - added SetDotRange
+
+   * gui/MGStarguider.cc:
+     - write interpolated pictures
+     
+   * videodev/PngReader.cc:
+     - removed unused variable
+     
+   * videodev/Writer.cc:
+     - added warning if file couldn't be opened
 
    * videodev/CaosFilter.[h,cc], videodev/PngReader.[h,cc]:

trunk/MagicSoft/Cosy/caos/Leds.h

@@ -23 +23 @@
     //nst Led &GetLed(int i) const { return *(Led*)( (*this)[i] ); }
 
-    const Led &operator()(int i) const { return *(Led*)((*(Leds*)this)[i]); }
-    Led &operator()(int i) { return *(Led*)((*(Leds*)this)[i]); }
+    const Led &operator()(int i) const { return *(Led*)At(i); }
+    Led &operator()(int i) { return *(Led*)At(i); }
 
     void Print(Option_t *o=NULL) const;

trunk/MagicSoft/Cosy/caos/Ring.cc

@@ -12 +12 @@
 bool Ring::CalcCenter(const Leds &leds, Int_t i, Int_t j, Int_t k)
 {
-    Float_t h1 = leds(i).GetY()- leds(j).GetY();
+    Double_t h1 = leds(i).GetY()- leds(j).GetY();
 
     if (h1==0)
@@ -25 +25 @@
     }
 
-    Float_t h2 = leds(j).GetY() - leds(k).GetY();
+    Double_t h2 = leds(j).GetY() - leds(k).GetY();
 
     if (h2==0)
@@ -38 +38 @@
     }
 
-    const Float_t w1 = leds(i).GetX() - leds(j).GetX();
-    const Float_t w2 = leds(j).GetX() - leds(k).GetX();
+    const Double_t w1 = leds(i).GetX() - leds(j).GetX();
+    const Double_t w2 = leds(j).GetX() - leds(k).GetX();
 
-    const Float_t m1 = -w1/h1;
-    const Float_t m2 = -w2/h2;
+    const Double_t m1 = -w1/h1;
+    const Double_t m2 = -w2/h2;
 
     if (m2-m1==0)

trunk/MagicSoft/Cosy/caos/Rings.cc

@@ -10 +10 @@
 void Rings::CalcCenters(const Leds &leds)
 {
+    Clear();
+
     int nPoints = leds.GetEntries();
 
@@ -28 +30 @@
             }
 
-    Expand(n);
+    //    Expand(n);
 }
 

trunk/MagicSoft/Cosy/caos/Rings.h

@@ -26 +26 @@
     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 &operator()(int i) const { return *(Ring*)At(i); }
+    Ring &operator()(int i) { return *(Ring*)At(i); }
 
     const Ring &GetCenter() const { return fCenter; }