Changeset 426 in Sophya

Timestamp:

Sep 24, 1999, 9:15:56 AM (26 years ago)

Author:

ansari

Message:

alpha delta a partir croisement galax

Location:

trunk/Poubelle/archTOI.old

Files:

• archeopsfile.cc (modified) (3 diffs)
• archeopsfile.h (modified) (2 diffs)
• archtoi.cc (modified) (1 diff)
• asigps.cc (modified) (1 diff)
• templocator.cc (modified) (1 diff)
• templocator.h (modified) (1 diff)
• toiiter.cc (modified) (9 diffs)
• toiiter.h (modified) (4 diffs)
• toisvr.cc (modified) (4 diffs)
• toisvr.h (modified) (1 diff)

trunk/Poubelle/archTOI.old/archeopsfile.cc

@@ -867 +867 @@
 
 
-long ArcheopsFile::getRawBolo(int ibolo, int imesure) {    // donnee brute, avec seulement soustraction offset
+double ArcheopsFile::getRawBolo(int ibolo, int imesure) {    // donnee brute, avec seulement soustraction offset
   int nb_coups,aa;  
   block_type_bolo* blk = imesure >= 0 ? lastBolo() : llastBolo();
@@ -883 +883 @@
   //cout << s*(((val_DS(ibolo,imesure)-aa)<<1)/nb_coups) << "\n";
 
-  return s*(((val_DS(ibolo,imesure)-aa)<<1)/nb_coups);
+  return s*(((val_DS(ibolo,imesure)-aa)<<1)/double(nb_coups));
 }
 
@@ -1020 +1020 @@
 }
 
-long ArcheopsFile::getSSTSignalCN(int idiode, int imesure) {
+double ArcheopsFile::getSSTSignalCN(int idiode, int imesure) {
   return getSSTRawSignalCN(SSTHandler::getDiodPermut(idiode),imesure);
 }
 
-long ArcheopsFile::getSSTRawSignalCN(int ichannel, int imesure) {
+double ArcheopsFile::getSSTRawSignalCN(int ichannel, int imesure) {
   // Si pas bloc comprime -> 0
   if (lastSSTComp() == NULL) return 0;

trunk/Poubelle/archTOI.old/archeopsfile.h

@@ -130 +130 @@
   int getBoloBlockNum();
   int getBoloCompBlockNum();
-  long getRawBolo(int ibolo, int imesure);   // donnee brute, avec seulement soustraction offset
+  double getRawBolo(int ibolo, int imesure);   // donnee brute, avec seulement soustraction offset
   double getRawBoloCN(int ibolo, int imesure);  // bruit de compression, sur donnee brute
   double getMuVBoloCN(int ibolo, int imesure);  // bruit de compression, en microVolts
@@ -152 +152 @@
   long getSSTRawSignal(int iDiode, int imesure);
   long getSSTSignal(int iDiode, int imesure);
-  long getSSTRawSignalCN(int iDiode, int imesure);
-  long getSSTSignalCN(int iDiode, int imesure);
+  double getSSTRawSignalCN(int iDiode, int imesure);
+  double getSSTSignalCN(int iDiode, int imesure);
   double getSSTStarZ(int iStar, int imesure);
   double getSSTStarF(int iStar, int imesure);

trunk/Poubelle/archTOI.old/archtoi.cc

@@ -133 +133 @@
   cout << "processing" << endl;
   while (iter.Next()) {
-    int nn = iter.getSampleIndex();
+    int nn = iter.getSampleIndex() / iter.getUnderSampling(); // Only for tick mark...
     #ifdef __MWERKS__
     yield();

trunk/Poubelle/archTOI.old/asigps.cc

@@ -13 +13 @@
   double omjd=0;
   while (f) {
-    char line[200];
-    f.getline(line,200);
+    char line[500];
+    f.getline(line,500);
     if (!f) break;
     char*p = line;

trunk/Poubelle/archTOI.old/templocator.cc

@@ -85 +85 @@
   double azCr1, azCr2;
   int rc = PlGalCross(ts/3600., lat, (90. - 41.), alpG, delG, azCr1, azCr2);
+  if (rc != 0) return; // pas deux points d'intersection
   
+  // Il faut determiner le croisement principal, ie le plus proche
+  // du centre galactique. Pendant le vol de Trapani, c'etait celui
+  // le plus proche de 220° d'azimut.
+  
+  double azCross = azCr1;
+  if (fabs(azCr2-220) < fabs(azCr1-220)) azCross = azCr2;
+  
+  double rotSpeed = 360./(crossings[icross] - crossings[icross-1]); // °/sample
+  
+  azimBolGC = azCross + (sampleNum - crossings[icross-1])*rotSpeed;
+  if (azimBolGC > 360) azimBolGC -= 360;
 }
+
+void TempLocator::getAltAzBolo(int sampleNum, int ibolo, double& elv, double& az) {
+  findGeomFromGC(sampleNum);
+  double delElv = 0;
+  double delAz = 0;  // relative to ch3-bolo6
+  elv = -99999;
+  az  = -99999;
+  switch (ibolo) {
+    case 11:
+      delElv =   0;
+      delAz  =   0.78;
+      break;
+    case 8:
+      delElv =   0.78 * sqrt(3.)/2.;
+      delAz  =   0.78 * 3./2.;
+      break;
+    case 13:
+      delElv = - 0.78 * sqrt(3.)/2.;
+      delAz  =   0.78 * 3./2.;
+      break;
+    case 9:
+      delElv =   0.78 * sqrt(3.)/2.;
+      delAz  =   0.78 * 1./2.;
+      break;
+    case 4:
+      delElv =   0.;
+      delAz  =   0.78 * 2.;
+      break;
+    case 15:
+      delElv =   0.;
+      delAz  =   0.;
+      break;
+    default:
+      return;
+  }
+  delAz /= cos(41 * M_PI/180);
+  elv = 41. + delElv;
+  az  = azimBolGC + delAz;
+  return;
+}
+
+double TempLocator::getAzimutBolo(int sampleNum, int ibolo) {
+  double elv, az;
+  getAltAzBolo(sampleNum, ibolo, elv, az);
+  return az;
+}
+
+double TempLocator::getElvBolo(int sampleNum, int ibolo) {
+  double elv, az;
+  getAltAzBolo(sampleNum, ibolo, elv, az);
+  return elv;
+}
+
+double TempLocator::getAlphaBolo(int sampleNum, int ibolo) {
+  double elv, az;
+  getAltAzBolo(sampleNum, ibolo, elv, az);
+  double ha;
+  aa_hadec (lat * M_PI/180, elv * M_PI/180, az * M_PI/180, &ha, &dec);
+  ra = - (ha * 180. / M_PI / 15) + (ts/3600.);
+  dec = dec * 180. / M_PI;
+  return ra;
+}
+
+double TempLocator::getDeltaBolo(int sampleNum, int ibolo) {
+  double elv, az;
+  getAltAzBolo(sampleNum, ibolo, elv, az);
+  double ha;
+  aa_hadec (lat * M_PI/180, elv * M_PI/180, az * M_PI/180, &ha, &dec);
+  ra = - (ha * 180. / M_PI / 15) + (ts/3600.);
+  dec = dec * 180. / M_PI;
+  return dec;
+}
+
 
 

trunk/Poubelle/archTOI.old/templocator.h

@@ -19 +19 @@
   double getAlphaBolo(int sampleNum, int ibolo);
   double getDeltaBolo(int sampleNum, int ibolo);
+  
+  void getAltAzBolo(int sampleNum, int ibolo, double& elv, double& az);
 
 protected:

trunk/Poubelle/archTOI.old/toiiter.cc

@@ -52 +52 @@
  
  initDone = false;
+ 
+ underSample = 1;
 }
 
@@ -87 +89 @@
   
   initDone = x.initDone;
+  underSample = x.underSample;
 }
 
@@ -238 +241 @@
         trigMask |= block_gps_mask;
         break;
-      case azimut:
+      case azimutBolo:
         trigMask |= block_bolo_mask;
         //file->needSSTProcessMask(SSTHandler::findPeriod);
@@ -353 +356 @@
 }
 
-
 bool TOIIter::Next() {
+  for (int ii=0; ii<underSample; ii++)
+    if (!Next1()) return false;
+  return true;
+}
+
+bool TOIIter::Next1() {
   if (!initDone) Init();
   while (1) {
@@ -484 +492 @@
    case tsid:
      return file->hasGPSPos();
-   case azimut:
+   case azimutBolo:
    case alphaAxis:
    case deltaAxis:
+   case alphaBolo:
+   case deltaBolo:
      return true;
      //return (file->lastGPS() != NULL && file->lastSST() != NULL);
    case alphaSst:
    case deltaSst:
-   case alphaBolo:
-   case deltaBolo:
      return false;
      
@@ -589 +597 @@
      tSid.setLongitude(file->getGPSLong());
      return tSid.getLST(getMJD());
-   case azimut:
+   case azimutBolo:
    case alphaAxis:
-   case deltaAxis: {
+   case deltaAxis: 
+   case alphaBolo:
+   case deltaBolo: {
         double lat, lon;
         if (auxGPS) {
@@ -606 +616 @@
         if ((kind) == alphaAxis) return tempLocator.getAlphaZenith();
         if ((kind) == deltaAxis) return tempLocator.getDeltaZenith();
+        if ((kind) == azimutBolo) return tempLocator.getAzimutBolo(getSampleIndex(),index);
+        if ((kind) == alphaBolo) return tempLocator.getAlphaBolo(getSampleIndex(),index);
+        if ((kind) == deltaBolo) return tempLocator.getDeltaBolo(getSampleIndex(),index);
         return 0;
      }
@@ -668 +681 @@
      case altitude:
        return file->blockNum() == file->getGPSBlockNum() && imes==0;
-     case azimut:
+     case azimutBolo:
+     case alphaBolo:
+     case deltaBolo:
        return true; // $CHECK$ with SSTHandler
      case alphaAxis:
@@ -726 +741 @@
 }
  
+int TOIIter::getUnderSampling() {
+  return underSample;
+}
+
 int TOIIter::getSampleIndex() {
   if (!initDone) Init();

trunk/Poubelle/archTOI.old/toiiter.h

@@ -47 +47 @@
   altitude,      // position ballon, m
   tsid,          // temps sideral en secondes
-  azimut,        // azimut centre optique ??? 
+  azimutBolo,    // azimut 
   alphaAxis,     // 
   deltaAxis,     //
@@ -79 +79 @@
    int    getBlockSampleIndex();        // numero d''echantillon dans dernier bloc bolo
    int    getSampleIndex();             // numero d''echantillon 
+   int    getUnderSampling();           
    double getMJD();            
 
@@ -103 +104 @@
    void ScanFiles(); // Parcourt tous les fichiers, cherche le premier echantillon...
    
+   bool Next1();
    bool NextSample(); // no test of trange
    bool NextFile();
@@ -147 +149 @@
    TSid tSid;
    
+   int underSample;
+   
    private:
    bool initDone;

trunk/Poubelle/archTOI.old/toisvr.cc

@@ -40 +40 @@
   if (tEnd>0)   iter.tEnd = tEnd;
 }
+
+void TOISvr::setUnderSample(int n) {
+  if (n<=1) n=1;
+  iter.underSample = n;
+}
+
   
 void TOISvr::addInfo(TOIKind kind, int index, bool triggering, bool interp) {
@@ -133 +139 @@
     else tsttoi(altitude)
     else tsttoi(tsid)
-    else tsttoi(azimut)
+    else tsttoi(azimutBolo)
     else tsttoi(alphaAxis)
     else tsttoi(deltaAxis)
@@ -198 +204 @@
   } else if (key == "#FILE") {
     addFile(arg);
+  } else if (key == "#UNDERSAMPLE") {
+    setUnderSample(atoi(arg.c_str()));
   } else if (key == "#RECORDER") {
     onBoardRecorderFiles(true);
@@ -228 +236 @@
   processRequest("#PERECH 0.005836818076");
   processRequest("#ASIGPS ASI_GPS_archeops1999.ascii");
+  processRequest("#COMMENT Archtoi -- 23 september 1999 -- Eric Aubourg CEA/DAPNIA");
   processRequest("#COMMENT ***WARNING***");
   processRequest("#COMMENT ***SOME TOI'S ARE PRELIMINARY***");
   processRequest("#COMMENT gyroSpeed is not calibrated");
-  processRequest("#COMMENT azimut/alpha/delta use galaxy crossings");
+  processRequest("#COMMENT azimut/alpha/delta use galaxy crossings and ASI GPS data");
   processRequest("#COMMENT and assume no pendulation");
-  
-}
+  processRequest("#COMMENT boloTens2 is not protected against glitches");
+  processRequest("#COMMENT sst software has not been updated to last DY code");
+  processRequest("#COMMENT trajectory info only while italian TM got GPS info");
+  processRequest("#COMMENT boloTemp is not implemented");
+  
+}

trunk/Poubelle/archTOI.old/toisvr.h

@@ -28 +28 @@
   
   void setTimeInterval(double tStart, double tEnd);
+  void setUnderSample(int n);
   
   void addInfo(TOIKind kind, int index, bool triggering=true, bool interp=false);