Changeset 436 in Sophya for trunk/Poubelle/archTOI.old/templocator.cc

Timestamp:

Sep 24, 1999, 11:23:23 PM (26 years ago)

Author:

ansari

Message:

vendredi soir...

File:

• trunk/Poubelle/archTOI.old/templocator.cc (modified) (9 diffs)

trunk/Poubelle/archTOI.old/templocator.cc

@@ -17 +17 @@
 {
   lon = lat = ts = 0;
-  ra  = dec = -99999;
+  raZ  = decZ = -99999;
   xSampleNum = -99999;
   fitsfile* fptr;
@@ -40 +40 @@
   this->lon = lon;
   this->lat = lat;
-  ra  = dec = -99999; xSampleNum = -99999;
+  raZ  = decZ = -99999; xSampleNum = -99999;
 }
 
@@ -46 +46 @@
   if (this->ts == ts) return;
   this->ts  = ts;
-  ra  = dec = -99999; xSampleNum = -99999;
+  raZ  = decZ = -99999; xSampleNum = -99999;
 }
   
 void   TempLocator::ComputeZenith() {
   double ha;
-  aa_hadec (lat * M_PI/180, .5 * M_PI, 0, &ha, &dec);
-  ra = - (ha * 180. / M_PI / 15) + (ts/3600.);
-  dec = dec * 180. / M_PI;
+  aa_hadec (lat * M_PI/180, .5 * M_PI, 0, &ha, &decZ);
+  raZ = - (ha * 180. / M_PI / 15) + (ts/3600.);
+  if (raZ>24) raZ -= 24;
+  if (raZ<0)  raZ += 24;
+  decZ = decZ * 180. / M_PI;
 }
   
 double TempLocator::getAlphaZenith() {
-  if (ra < -100) ComputeZenith();
-  return ra;
+  if (raZ < -100) ComputeZenith();
+  return raZ;
 }
 
 double TempLocator::getDeltaZenith() {
-  if (dec < -100) ComputeZenith();
-  return dec;
-}
+  if (decZ < -100) ComputeZenith();
+  return decZ;
+}
+
+#define altbolo1 41.5
 
 void TempLocator::findGeomFromGC(int sampleNum) // pour le bolo qui voit les xing
 {
   if (sampleNum == xSampleNum) return;
-  if (dec < -100) ComputeZenith();
+  if (decZ < -100) ComputeZenith();
   
   azimBolGC = -9999;
@@ -84 +88 @@
   double delG = 27. + 07./60. + 42./3600.;
   double azCr1, azCr2;
-  int rc = PlGalCross(ts/3600., lat, (90. - 41.), alpG, delG, azCr1, azCr2);
+  int rc = PlGalCross(ts/3600., lat, (90. - altbolo1), alpG, delG, azCr1, azCr2);
   if (rc != 0) return; // pas deux points d'intersection
   
@@ -97 +101 @@
   
   azimBolGC = azCross - (sampleNum - (crossings[icross-1]+12))*rotSpeed;
-  // azimut du bolo 1 (central) pour sampleNum
+  // azimut bolo 1 from crossing, for sampleNum
   if (azimBolGC > 360) azimBolGC -= 360;
 }
@@ -121 +125 @@
       break;
     case 9:
-      delElv = - 0.78 * sqrt(3.)/2.;
-      delAz  =   0.78 * 1./2.;
+      delElv =   0.78 * sqrt(3.)/2.;
+      delAz  = - 0.78 * 1./2.;
       break;
     case 4:
@@ -136 +140 @@
   }
   delAz /= cos(41 * M_PI/180);
-  elv = 41. + delElv;
+  elv = altbolo1 + delElv;
   az  = azimBolGC + delAz;
+  if (az>360) az -= 360;
+  if (az<0)   az += 360;
   return;
 }
@@ -157 +163 @@
   getAltAzBolo(sampleNum, ibolo, elv, az);
   double ha;
+  double ra,dec;
   aa_hadec (lat * M_PI/180, elv * M_PI/180, az * M_PI/180, &ha, &dec);
   ra = - (ha * 180. / M_PI / 15) + (ts/3600.);
@@ -167 +174 @@
   getAltAzBolo(sampleNum, ibolo, elv, az);
   double ha;
+  double ra,dec;
   aa_hadec (lat * M_PI/180, elv * M_PI/180, az * M_PI/180, &ha, &dec);
   ra = - (ha * 180. / M_PI / 15) + (ts/3600.);