Changeset 1757

Timestamp:

02/14/03 17:12:58 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Cosy/.cosyrc (modified) (1 diff)
• Cosy/Changelog (modified) (1 diff)
• Cosy/Makefile (modified) (1 diff)
• Cosy/candrv/vmodican.cc (modified) (3 diffs)
• Cosy/catalog/SlaPlanets.cc (modified) (2 diffs)
• Cosy/catalog/SlaStars.cc (modified) (1 diff)
• Cosy/catalog/Slalib.cc (modified) (1 diff)
• Cosy/catalog/Slalib.h (modified) (2 diffs)
• Cosy/main/MCosy.cc (modified) (3 diffs)
• Cosy/main/MCosy.h (modified) (1 diff)
• slalib/Makefile (modified) (1 diff)

trunk/MagicSoft/Cosy/.cosyrc

@@ -19 +19 @@
 Zd_ResRE[re/U_mot]: 500
 
+#Az_Min: -90
+#Az_Max: 318
+
+#Zd_Min: -90
+#Zd_Max: 100
+
 Az_Id-MAC1: 1
 Az_Id-MAC2: 3

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
 
+ 2003/02/14 - Thomas Bretz (La Palma):
+ 
+   * .cosyrc:
+     - added prototypes for the telescope allowed range
+   
+   * Makefile:
+     - changed test to testse
+   
+   * candrv/vmodican.cc:
+     - added the possibility to start cosy without the CANbus card
+       installed
+   
+   * catalog/SlaPlanets.cc:
+     - fixed the ephemeris configuration
+   
+   * catalog/SlaStars.cc:
+     - added some more comments
+   
+   * catalog/Slalib.[h,cc]:
+     - changed Wuerzburg location to LaPalma location
+     - added Height to the data members
+   
+   * main/MCosy.[h,cc]:
+     - added range checks in positioning and tracking
+   
+   * slalib/Makefile:
+     - added rdplan
+     - added pvobs
+     - added dtt
+     - added dat
+     - added rcc
+
+
+     
  2003/01/23 - Thomas Bretz:
  
-  * .cosyrc:
-    - changed maximum time to reach home from 100 to 150
-  
-  * Makefile:
-    - added devdrv
-  
-  * Makefile.rules, candrv/Makefile, devdrv/Makefile:
-    - changed some ordering
-  
-  * devdrv/shaftencoder.cc:
-    - changed Guarding from 2x125 to 2x175
-  
-  * main/MCosy.cc:
-    - fixed StopWaitingForSDO bug (if this was raised once the
-      'shutdown' never waited correctly for an SDo anymore)
-    - fixed the usage of the bending correction in some places
-
-  * testse.cc:
-    - added
+   * .cosyrc:
+     - changed maximum time to reach home from 100 to 150
+  
+   * Makefile:
+     - added devdrv
+  
+   * Makefile.rules, candrv/Makefile, devdrv/Makefile:
+     - changed some ordering
+  
+   * devdrv/shaftencoder.cc:
+     - changed Guarding from 2x125 to 2x175
+  
+   * main/MCosy.cc:
+     - fixed StopWaitingForSDO bug (if this was raised once the
+       'shutdown' never waited correctly for an SDo anymore)
+     - fixed the usage of the bending correction in some places
+
+   * testse.cc:
+     - added
 
 

trunk/MagicSoft/Cosy/Makefile

@@ -20 +20 @@
 #
 
-PROGRAMS = test cosy starg
+PROGRAMS = testse cosy starg
 SOLIB    = 
 CINT     = M

trunk/MagicSoft/Cosy/candrv/vmodican.cc

@@ -64 +64 @@
 int VmodIcan::Ioctl(int msg, void *arg)
 {
-    return ioctl(fd, msg, (int)arg) >= 0;
+    return fd<0 ? 1 : ioctl(fd, msg, (int)arg) >= 0;
 }
 
@@ -104 +104 @@
 void *VmodIcan::Thread()
 {
+    if (fd<0)
+        return NULL;
+
     lout << "- Starting Receiver Loop." << endl;
 
@@ -946 +949 @@
         cout << "Cannot open device '" << dev << "'... exit." << endl;
         cout << strerror(errno) << endl;
-        exit(1);                       // open module
+//        exit(1);                       // open module
     }
 

trunk/MagicSoft/Cosy/catalog/SlaPlanets.cc

@@ -29 +29 @@
 }
 
+#include "SlaStars.h"
+
 void SlaPlanets::UpdatePlanetPos(ePlanets_t planet)
 {
+    /*
     double cp[6] = { 0, 0, 0, 0, 0, 0 };
 
@@ -52 +55 @@
     case kENeptune:
     case kEPluto:
+    case kESun:
         {
-            //
-            // coordinates of planet: heliocentric, equatoril, J2000
-            //
+        */
+    //
+    // coordinates of planet: heliocentric, equatoril, J2000
+    //
+    double ra,dec,diam;
+    // TDB, planet, elong, phi, *ra, *dec, *diam
 
-            int rc;
-            slaPlanet(GetMjd(), planet, cp, &rc);
+    // One can use TT instead of TDB for all plenets
+    // (except the moon)
 
-            if (rc)
-                return;
-        }
-        // !! Fall through!
+    const double tt = GetMjd() + slaDtt(GetMjd())/60./60./24.;
 
-    case kESun:
-        coord[0] = cp[0] - fEarth[0];
-        coord[1] = cp[1] - fEarth[1];
-        coord[2] = cp[2] - fEarth[2];
-        break;
-    }
+    // FIXME: Shell be UT1
+    const double ut1 = fmod(GetMjd(), 1);
 
-    fZdAz[planet] = XYZ2ZdAz(coord);
+    // tt should be tdb, but tt can be used
+    const double tdb = tt + slaRcc(tt, ut1, GetElong(), 8300*cos(GetPhi()), 8300*sin(GetPhi() ))/60./60./24.;
+    /*
+     cout << "Dt: " << slaDtt(GetMjd()) << endl;
+     cout << "Rc: " << slaRcc(tt, ut1, GetElong(), 8300*cos(GetPhi()), 8300*sin(GetPhi() )) << endl;
+     */
+    slaRdplan(tt, planet, GetElong(), GetPhi(),
+              &ra, &dec, &diam);
+    /*
+     switch (planet)
+     {
+     case kEMoon: cout << "Moon: "; break;
+     case kEMercury: cout << "Merkur: "; break;
+     case kEVenus: cout << "Venus: "; break;
+     case kEMars: cout << "Mars: "; break;
+     case kEJupiter: cout << "Jupiter: "; break;
+     case kESaturn: cout << "Saturn: "; break;
+     case kEUranus: cout << "Uranus: "; break;
+     case kENeptune: cout << "Neptun: "; break;
+     case kEPluto: cout << "Pluto: "; break;
+     case kESun: cout << "Sonne: "; break;
+     }
+
+     cout << (int)(ra*12/TMath::Pi()) << "h"<< (int)(ra*12/TMath::Pi()*60)%60 <<"min ";
+     cout << (int)(dec*kRad2Deg) << "deg" << (int)(dec*kRad2Deg*60)%60 << "min" << endl;
+     */
+    /*
+     SlaStars sla;
+     sla.SetMjd(GetMjd());
+     ZdAz za = sla.CalcZdAz(RaDec(ra,dec));
+     cout << za.Zd()*kRad2Deg << " " << fmod(za.Az()*kRad2Deg+720,360.) << endl;
+     fZdAz[planet] = za;
+     */
+
+    double az, el;
+    slaDe2h(GetAlpha()-ra, dec, GetPhi(), &az, &el);
+
+    cout << 90-el*kRad2Deg << " " << fmod(az*kRad2Deg+720,360.) << endl;
+    fZdAz[planet].Set(TMath::Pi()/2-el, az);
+    /*
+     }
+     // !! Fall through!
+     break;
+     case kESun:
+     coord[0] = cp[0] - fEarth[0];
+     coord[1] = cp[1] - fEarth[1];
+     coord[2] = cp[2] - fEarth[2];
+     break;
+     }
+     fZdAz[planet] = XYZ2ZdAz(coord);
+
+     if (planet==kESun)
+     {
+     cout << fZdAz[kESun].Zd()*kRad2Deg << " " <<  fZdAz[kESun].Az()*kRad2Deg << endl;
+     }*/
 }

trunk/MagicSoft/Cosy/catalog/SlaStars.cc

@@ -38 +38 @@
     // ----- calculate star independent parameters ----------
     //
-    slaMappa(2000.0, mjd, fAmprms);
-    slaAoppa(mjd, 0,                    // mjd, UT1-UTC
+
+    // prepare calculation: Mean Place to geocentric apperent
+    slaMappa(2000.0, mjd, fAmprms);        // Epoche, TDB
+
+    // prepare: Apperent to observed place
+    slaAoppa(mjd, 0,                       // mjd, Delta UT=UT1-UTC
              // GetElong(), GetPhi(), 148, // göttingen long, lat, height
-             GetElong(), GetPhi(), 300, // göttingen long, lat, height
-             0, 0,                      // polar motion x, y-coordinate (radians)
+             GetElong(), GetPhi(), GetHeight(), // göttingen long, lat, height
+             0, 0,                         // polar motion x, y-coordinate (radians)
              // 273.155, 1013.25, 0.5,     // temp, pressure, humidity
              273.155+20, 1013.25, 0.5,     // temp, pressure, humidity
              // 0.2, 0.0065,               // wavelength, tropo lapse rate
-             0.55, 0.0065,               // wavelength, tropo lapse rate
+             0.55, 0.0065,                 // wavelength, tropo lapse rate
              fAoprms);
 }

trunk/MagicSoft/Cosy/catalog/Slalib.cc

@@ -18 +18 @@
     //
     int status;
-    slaDaf2r(51, 38, 48.0, &fPhi,   &status);
-    slaDaf2r( 9, 56, 36.0, &fElong, &status);
+    //slaDaf2r(51, 38, 48.0, &fPhi,   &status);
+    //slaDaf2r( 9, 56, 36.0, &fElong, &status);
+    //fHeight = 300;
+
+    slaDaf2r(28, 45, 30.0, &fPhi,   &status);
+    slaDaf2r(17, 52, 48.0, &fElong, &status);
+
+    fElong *= -1;
+    fHeight = 2326;
 
     cout << "Latitude: 51\x9c 38'48.0\" = " <<  kRad2Deg*fPhi << "   ";

trunk/MagicSoft/Cosy/catalog/Slalib.h

@@ -16 +16 @@
     double   fElong;
 
+    double   fHeight;
+
 public:
     Slalib();
@@ -29 +31 @@
     virtual void SetMjd(const double mjd);
 
-    double GetAlpha() const { return fAlpha; }
-    double GetMjd() const   { return fMjd; }
+    double GetAlpha() const  { return fAlpha; }
+    double GetMjd() const    { return fMjd; }
 
-    double GetPhi() const   { return fPhi; }
-    double GetElong() const { return fElong; }
+    double GetPhi() const    { return fPhi; }
+    double GetElong() const  { return fElong; }
+
+    double GetHeight() const { return fHeight; }
 
     ZdAz   XYZ2ZdAz(double coord[3]) const;

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -391 +391 @@
 {
     // FIXME: Correct by fOffset ?
+
+    const ZdAz d = dst*kRad2Deg;
+    if (d.Zd()<fMin.Zd() || d.Zd()>fMax.Zd() || d.Az()<fMin.Az() || d.Az()>fMax.Az())
+    {
+        lout << "ERROR: Requested Position not inside allowed range." << endl;
+        return kFALSE;
+    }
+
 
     /*
@@ -724 +732 @@
         ZdAz dummy = fBending(sla.CalcZdAz(fRaDec));
         dest = CorrectTarget(GetSePos(), dummy); // [se]
+
+        const ZdAz d = dest*360./16384; // [deg]
         dest *= kGearRatio;  // [re]
+
+        if (d.Zd()<fMin.Zd() || d.Zd()>fMax.Zd() || d.Az()<fMin.Az() || d.Az()>fMax.Az())
+        {
+            lout << "ERROR: Calculated position for T+dt not inside allowed range." << endl;
+            break;
+        }
 
         ZdAz vcalc = sla.GetApproxVel(fRaDec) * kGearRatio2*4./60.;  // [re/min]
@@ -1070 +1086 @@
     TEnv env(".cosyrc");
     cout << "done." << endl;
+
+    cout << "Reading telescope range..." << flush;
+    const Double_t amin = env.GetValue("Az_Min", -90.0);
+    const Double_t zmin = env.GetValue("Zd_Min", -90.0);
+    fMin.Set(zmin, amin);
+
+    cout << " Min: " << zmin << "deg  " << amin << "deg" << endl;
+
+    const Double_t amax = env.GetValue("Az_Max", 318.0);
+    const Double_t zmax = env.GetValue("Zd_Max", 100.0);
+    fMax.Set(zmax, amax);
+
+    cout << " Max: " << zmax << "deg  " << amax << "deg" << endl;
 
     cout << "Reading gear ratios..." << flush;

trunk/MagicSoft/Cosy/main/MCosy.h

@@ -83 +83 @@
     ZdAz  fAccuracy;      // Actual accuracy of Tracking
     ZdAz  fVelocity;      // Actual velocity of Tracking
+    ZdAz  fMin;
+    ZdAz  fMax;
 
     XY kGearRatio;        // describing the gear of the system [re/se]

trunk/MagicSoft/slalib/Makefile

@@ -38 +38 @@
         drange.c deuler.c cldj.c   aopqk.c  refz.c  dh2e.c  de2h.c   \
         dt.c     dmoon.c  planet.c planel.c el2ue.c ue2pv.c pv2ue.c  \
-        altaz.c
+        altaz.c  rdplan.c pvobs.c  dtt.c    dat.c   rcc.c
 #       addet.c
 #        afin.c airmas.c altaz.c amp.c \