Changeset 635 in Sophya

Timestamp:

Nov 25, 1999, 9:55:44 AM (26 years ago)

Author:

ansari

Message:

warnings linux egcs, et struct Horloge

Location:

trunk/Poubelle/archTOI.old

Files:

• archeops_28.h (modified) (3 diffs)
• gyrocalibrator.cc (modified) (1 diff)
• sststarfinder.cc (modified) (2 diffs)
• starmatcher.cc (modified) (3 diffs)
• toiiter.cc (modified) (1 diff)

trunk/Poubelle/archTOI.old/archeops_28.h

@@ -440 +440 @@
         char    flag;
         }
-        horloge;
+        Horloge;
 
 typedef struct
@@ -487 +487 @@
         char    periode;
         }
-        horloge;
+        Horloge;
         
 
@@ -541 +541 @@
 typedef struct                                                  /*  int4 en mot de 32 bit       */
         {
-        horloge                 horloge;                        /*                      1       */
+        Horloge                 horloge;                        /*                      1       */
         reglage_un_bolo         bolo[nb_max_bolo];              /*      18 * 2  =       36      */
         auto_bolo               autom[nombre_de_voies];         /*      6  * 1          6       */                                                              

trunk/Poubelle/archTOI.old/gyrocalibrator.cc

@@ -104 +104 @@
     TOIProducer* prod =  (*i).second;
     if (inToi.name == "rotSpeed")        lastRotSpeed = prod->getValue(sampleNum, inToi);
-    if (inToi.name == "rotSpeedSample1") lastFence1   = prod->getValue(sampleNum, inToi);
-    if (inToi.name == "rotSpeedSample2") lastFence2   = prod->getValue(sampleNum, inToi);
+    if (inToi.name == "rotSpeedSample1") lastFence1   = long(prod->getValue(sampleNum, inToi));
+    if (inToi.name == "rotSpeedSample2") lastFence2   = long(prod->getValue(sampleNum, inToi));
     if (inToi.name == "gyroV")           gyroProducer = prod;
   }

trunk/Poubelle/archTOI.old/sststarfinder.cc

@@ -181 +181 @@
   if (StarHistoryMap.empty()) return -1;
   StarHistIter i = StarHistoryMap.begin();
-  return floor((*i).second.TEchan);
+  return long(floor((*i).second.TEchan));
 }
 
@@ -188 +188 @@
   StarHistIter i = StarHistoryMap.end();
   i--;
-  return floor((*i).second.TEchan);
+  return long(floor((*i).second.TEchan));
 }
   

trunk/Poubelle/archTOI.old/starmatcher.cc

@@ -340 +340 @@
   // we remove "bursts" of stars, ie more than 4 stars in the same samplenum
   
-  long lastSN = 0;
+  double lastSN = 0;
   deque<matchStar>::iterator lastIt = it;
   long burstLen = 0;
@@ -373 +373 @@
   
   //long sn0 = matchStars.front().SN;
-  long sn0 = (*it).SN;
+  double sn0 = (*it).SN;
   PolFitClip2 fitElvAz(matchStars.size(), 2); fitElvAz.setClip(0.1,0,2,3);
   ndata = 0;
@@ -479 +479 @@
   
   // $CHECK$ utiliser plutot le SN moyen/median de tous les points effectivement utilises.
-  long snmid = ((*it).SN + (*itstart).SN)/2;
+  double snmid = ((*it).SN + (*itstart).SN)/2;
     
   ndata=0;  

trunk/Poubelle/archTOI.old/toiiter.cc

@@ -278 +278 @@
   if (curSample <= 0) curSample = sStart-1;  
   if (curSample <= 0) {
-    long sn = archParam.acq.MJD2SN(mjdStart) - 1;
+    long sn = (long)(archParam.acq.MJD2SN(mjdStart) - 1);
     if (sn > curSample) curSample = sn;
   }