Changeset 639 in Sophya for trunk/Poubelle/archediab.old/archediab.sources/c/acquisition_archeops.c

Timestamp:

Nov 25, 1999, 2:07:25 PM (26 years ago)

Author:

ansari

Message:

archediab 25

File:

• trunk/Poubelle/archediab.old/archediab.sources/c/acquisition_archeops.c (modified) (4 diffs)

trunk/Poubelle/archediab.old/archediab.sources/c/acquisition_archeops.c

@@ -190 +190 @@
 {
 blk_sync2 = *blk;
-}
-/*
-int i,j;        
-
-for (i=0;i<nb_per_block*2;i++)  for(j=0;j<nb_sync;j++)                  
-                gg->don.sync[j]=blk->synchro[j][i];
 // ne fait rien: le block synchro precede toujours le block bolo
 }
-*/
+
 
 
@@ -210 +204 @@
 #define blk2  ((block_type_bolo*)(&bktm))       // pointeur sur la memoire locale
 // maintenant, decomprime  blk  pour le reecrire dans blk2
-printf("comprime: ds1= %x  , %x  ds2= %x  , %x   ",
+/*printf("comprime: ds1= %x  , %x  ds2= %x  , %x   ",
         ( (blk->data_bolo[0][0] & 0xffff0000)>>11 ) & 0x001fffe0,
         ( (blk->data_bolo[0][0] & 0x0000ffff)<<5 )  & 0x001fffe0,
         ( (blk->data_bolo[1][0] & 0xffff0000)>>11 ) & 0x001fffe0,
         ( (blk->data_bolo[1][0] & 0x0000ffff)<<5 )  & 0x001fffe0);
-
+*/
 for(j=0;j<nb_bolo_util;j++)     
                 {
-                decompress_7_2(blk->data_bolo[j],blk2->data_bolo[j],nb_per_block*2);
-                }
-
-printf("ds1= %x  , %x  ds2= %x  , %x   \n",
+                decompress_7_2((long *)blk->data_bolo[j],blk2->data_bolo[j],nb_per_block*2);
+                }
+
+/*printf("ds1= %x  , %x  ds2= %x  , %x   \n",
                                         blk2->data_bolo[0][0],
                                         blk2->data_bolo[0][1],
                                         blk2->data_bolo[1][0],
                                         blk2->data_bolo[1][1]);
-
+*/
 valide_block(&bktm,block_bolo,numero_block(blk));       // pour recopier le numero de block
 traite_block_bolo(blk2);
@@ -277 +271 @@
 
 #define  val_DS(j,i)  (blk->data_bolo[j][i]&0x1fffff)
-#define  synchro_DS(j,i)        (blk->data_bolo[j][i]>>20)
+//#define  synchro_DS(j,i)      ((blk->data_bolo[j][i]>>20)&1)
 
 for (i=0;i<nb_per_block*2;i++)
@@ -291 +285 @@
                 }
 
-        for(j=0;j<nb_sync;j++)  gg->don.sync[j]=synchro_DS(j,i);        
+        for(j=0;j<nb_sync;j++)  
+                {
+                gg->don.sync[j]=blk_sync2.synchro[i][j];
+                }
+        
+        
+//      gg->don.sync[j]=synchro_DS(j,i);        
 
         gg->temps_cntl=num_block_local*nb_per_block*2+i;        // temps controlleur en demi-periodes