Index: /trunk/Poubelle/archediab.old/SimulMission/simulmission.c
===================================================================
--- /trunk/Poubelle/archediab.old/SimulMission/simulmission.c	(revision 656)
+++ /trunk/Poubelle/archediab.old/SimulMission/simulmission.c	(revision 657)
@@ -9,4 +9,5 @@
 #include "choix_acquisition.h"
 #include "archeops.h"
+#include "arcunit.h"
 #include "choix_param.h"
 #include "structure.h"
@@ -683,8 +684,10 @@
 // microvolts -> codage
 
+
 def_gains
+
 #define		gainbrut(aa)	((char)(((aa).mot1&0x1f)))		
 #define		gain(aa)	gains_reels[gainbrut(aa)]		
-#define codsignal(muv) muv/1.e5 * (65536.*gain(simReglage.bolo[i]))
+#define 	codsignal(muv) (muv/1.e5 * (65536.*gain(simReglage.bolo[i])))
 
 void PerformScan()
@@ -829,5 +832,5 @@
   }
         
-  for(i=5;i<nb_bolo_util;i++)	
+  for(i=5;i<parametr.nb_bolo;i++)	
     for (j=0; j<nb_per_block*2; j++) {
       blk->data_bolo[i][j] = 0;
@@ -844,5 +847,5 @@
   SimBlocBolo(tt);
   blk = (block_type_bolo*) &(tt->vi.btt);
-  for(i=0;i<nb_bolo_util;i++) {
+  for(i=0;i<parametr.nb_bolo;i++) {
     compress_7_2((unsigned long*)blk->data_bolo[i],(unsigned long*)blk2.data_bolo[i],nb_per_block*2,1);
   }
Index: /trunk/Poubelle/archediab.old/archediab.sources/c/acquisition_archeops.c
===================================================================
--- /trunk/Poubelle/archediab.old/archediab.sources/c/acquisition_archeops.c	(revision 656)
+++ /trunk/Poubelle/archediab.old/archediab.sources/c/acquisition_archeops.c	(revision 657)
@@ -317,5 +317,5 @@
 jc=0;for(j=0;j<nb_max_bolo;j++)	 // jc = bolo_comprime  //   j=bolo normal
 		{
-		if( (parametr.bolo[j].bolo_code_util==bolo_normal_transmis) &&  (jc<parametr.nb_bolo)  )
+		if( (parametr.bolo[j].bolo_code_util&bolo_transmis_comprime) &&  (jc<parametr.nb_bolo)  )
 			{
 			decompress_7_2((long *)blk->data_bolo[jc],blk2->data_bolo[j],nb_per_block*2);
Index: /trunk/Poubelle/archediab.old/archediab.sources/c/arcunit.c
===================================================================
--- /trunk/Poubelle/archediab.old/archediab.sources/c/arcunit.c	(revision 656)
+++ /trunk/Poubelle/archediab.old/archediab.sources/c/arcunit.c	(revision 657)
@@ -133,5 +133,5 @@
 for(j=0;(j<nb_max_bolo) && (k<4);j++)
 	{
-	if(param_pt->bolo[j].bolo_code_util==bolo_thermo_simplifie)
+	if(param_pt->bolo[j].bolo_code_util&bolo_thermo_simplifie)
 		{
 		if(k==indice_tempe)
@@ -159,5 +159,5 @@
 for(j=0;(j<nb_max_bolo) && (k<4);j++)
 	{
-	if(param_pt->bolo[j].bolo_code_util==bolo_thermo_simplifie)
+	if(param_pt->bolo[j].bolo_code_util&bolo_thermo_simplifie)
 		{
 		if(k==indice_tempe)
Index: /trunk/Poubelle/archediab.old/archediab.sources/c/compress.c
===================================================================
--- /trunk/Poubelle/archediab.old/archediab.sources/c/compress.c	(revision 656)
+++ /trunk/Poubelle/archediab.old/archediab.sources/c/compress.c	(revision 657)
@@ -1,32 +1,43 @@
-#include <manip.h>
+#include "manip.h"
 #include "compress.h"
 
 
 /*******************************************************************************************/
-/****************   			 											****************/
-/****************   			 		compress_3							****************/
-/****************   			 											****************/
-/*******************************************************************************************/
-
-void  com_3(long val,long* in,long*out,int n,int pasin);
-
-
-#define kmax_	15		/*  valeur maximum de l'exposant	*/
-#define	kmak_	0xf		/*	masque pour l'exposant		*/
-#define	emak_	0x7		/*	masque pour l'ecart		*/		
-#define	sgbi_	0x4		/*	bit de signe de l'ecart		*/
-#define	sign_	0xfffffff8	/*	masque de signe de l'ecart	*/
-
-/*  compress un tableau in de n*9 points disposé avec un pas pasin		*/
+/****************   			 					************/
+/****************   			 		compress_3		************/
+/****************   			 					************/
+/*******************************************************************************************/
+
+static int filtre[16]={0xfffffff,0xffffffe,0xffffffc,0xffffff8,
+		0xffffff0,0xfffffe0,0xfffffc0,0xfffff80,
+		0xfffff00,0xffffe00,0xffffc00,0xffff800,
+		0xffff000,0xfffe000,0xfffc000,0xfff8000};
+int test[16]=  {0x00000000,0x00000001,0x00000002,0x00000004,
+		0x00000008,0x00000010,0x00000020,0x00000040,
+		0x00000080,0x00000100,0x00000200,0x00000400,
+		0x00000800,0x00001000,0x00002000,0x00004000};
+
+
+void  com_3(unsigned long val,unsigned long* in,unsigned long*out,int n,int pasin);
+
+#define	data_mask	0xffff	/* masque pour les données en entree	*/
+#define	ecart_(i,n,val)		(( (in[(i*9+n)*pasin]&data_mask) | ecart_bit )-val);
+
+#define	ecart_mask		0x7	/*	masque pour l'ecart		*/		
+
+
+
+/*  compress un tableau in de n*9 points disposé avec un pas pasin	*/
 /*  les data compressées sont ecrites dans le tableau out de n points	*/
-/*  la valeur val est la valeur de reference du point origine			*/
-
-
-/*  comprime	9*n points  : 1er point dans 1er mot, tous les ecarts dans les n mots suivants		*/ 
-/*	9*n	==>	n+1	    pour  72 points :   9 mots			*/
-
-void compress_3_1(long* in,long*out,int n,int pasin)
-{
-long val;
+/*  la valeur val est la valeur de reference du point origine		*/
+
+
+/*  comprime	9*n points  : 1er point dans 1er mot			*/
+/*			      tous les ecarts dans les n mots suivants	*/ 
+/*	9*n	==>	n+1	    pour  72 points :   9 mots		*/
+
+void compress_3_1(unsigned long* in,unsigned long*out,int n,int pasin)
+{
+unsigned long val;
 val=in[0]; out[0]=val;
 com_3(val,in,out+1,n/9,pasin);
@@ -35,18 +46,10 @@
 
 
-void  com_3(long val,long* in,long*out,int n,int pasin)
-{
-int filtre[16]={0xffffffff,0xfffffffe,0xfffffffc,0xfffffff8,
-				0xfffffff0,0xffffffe0,0xffffffc0,0xffffff80,
-				0xffffff00,0xfffffe00,0xfffffc00,0xfffff800,
-				0xfffff000,0xffffe000,0xffffc000,0xffff8000};
-int test[16]=  {0x00000000,0x00000001,0x00000002,0x00000004,
-				0x00000008,0x00000010,0x00000020,0x00000040,
-				0x00000080,0x00000100,0x00000200,0x00000400,
-				0x00000800,0x00001000,0x00002000,0x00004000};
-
-long val1;
-long ec1,ec2,ec3,ec4,ec5,ec6,ec7,ec8,ec9;
-int i,k,k1;long q;
+
+void  com_3(unsigned long val,unsigned long* in,unsigned long*out,int n,int pasin)
+{
+unsigned long val1;
+unsigned long ec1,ec2,ec3,ec4,ec5,ec6,ec7,ec8,ec9;
+int i,k,k1;unsigned long q;
 
 
@@ -55,55 +58,56 @@
 	k=0;q=3;	/* 3 bit = 7 = +-3	*/
 
-	ec1=in[i*9*pasin]-val;
+	ec1=ecart_(i,0,val);
 	shif(ec1,k,q);
-	val1=val + arrondi(ec1,k);
+	val1=new_val(val,ec1,k);
 	
 	k1=k;
-	ec2=in[(i*9+1)*pasin]-val1;
+	ec2=ecart_(i,1,val1);
 	shif(ec2,k,q);
 	
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k);}
-	val1+= arrondi(ec2,k);
-
-	ec3=in[(i*9+2)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=new_val(val,ec1,k);}
+	val1=new_val(val1,ec2,k);
+
+	ec3=ecart_(i,2,val1);
 	shif(ec3,k,q);
 
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k) + arrondi(ec2,k);}
-	val1+= arrondi(ec3,k);		
-
-	ec4=in[(i*9+3)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=(val + arrondi(ec1,k) + arrondi(ec2,k))&data_mask;}
+	val1=new_val(val1,ec3,k);
+
+	ec4=ecart_(i,3,val1);
 	shif(ec4,k,q);
 
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k);}
-	val1+= arrondi(ec4,k);		
-
-	ec5=in[(i*9+4)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=(val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k))&data_mask;}
+	val1=new_val(val1,ec4,k);
+
+	ec5=ecart_(i,4,val1);
 	shif(ec5,k,q);
 
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k) + arrondi(ec4,k);}
-	val1+= arrondi(ec5,k);		
-	
-	ec6=in[(i*9+5)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=(val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k) 
+				+ arrondi(ec4,k))&data_mask;}
+	val1=new_val(val1,ec5,k);
+	
+	ec6=ecart_(i,5,val1);
 	shif(ec6,k,q);
 
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k)
-					 + arrondi(ec4,k) + arrondi(ec5,k);}
-	val1+= arrondi(ec6,k);		
-	
-	ec7=in[(i*9+6)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=(val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k)
+					+ arrondi(ec4,k) + arrondi(ec5,k))&data_mask;}
+	val1=new_val(val1,ec6,k);
+	
+	ec7=ecart_(i,6,val1);
 	shif(ec7,k,q);
 
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k) + arrondi(ec2,k) 
-				+ arrondi(ec3,k) + arrondi(ec4,k) + arrondi(ec5,k) + arrondi(ec6,k);}
-	val1+= arrondi(ec7,k);		
-	
-	ec8=in[(i*9+7)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=(val + arrondi(ec1,k) + arrondi(ec2,k) 
+				+ arrondi(ec3,k) + arrondi(ec4,k) + arrondi(ec5,k) + arrondi(ec6,k))&data_mask;}
+	val1=new_val(val1,ec7,k);
+	
+	ec8=ecart_(i,7,val1);
 	shif(ec8,k,q);
 
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k)
-					 + arrondi(ec4,k) + arrondi(ec5,k) + arrondi(ec6,k) + arrondi(ec7,k);}
-	val1+= arrondi(ec8,k);		
-	
-	ec9=in[(i*9+8)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=(val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k)
+					 + arrondi(ec4,k) + arrondi(ec5,k) + arrondi(ec6,k) + arrondi(ec7,k))&data_mask;}
+	val1=new_val(val1,ec8,k);
+	
+	ec9=ecart_(i,8,val1);
 	shif(ec9,k,q);
 	
@@ -120,12 +124,12 @@
 	ec9 =  arrondi(ec9,k) >> k;
 
-	out[i]= ((ec1&emak_)<<29) | ((ec2&emak_)<<26) | ((ec3&emak_)<<23) 
-				| ((ec4&emak_)<<20) | ((ec5&emak_)<<17) | ((ec6&emak_)<<14)
-				| ((ec7&emak_)<<11)  | ((ec8&emak_)<<8) | ((ec9&emak_)<<5) | k ;
+	out[i]= ((ec1&ecart_mask)<<29) | ((ec2&ecart_mask)<<26) | ((ec3&ecart_mask)<<23) 
+		| ((ec4&ecart_mask)<<20) | ((ec5&ecart_mask)<<17) | ((ec6&ecart_mask)<<14)
+		| ((ec7&ecart_mask)<<11)  | ((ec8&ecart_mask)<<8) | ((ec9&ecart_mask)<<5) | k ;
 
 
 /*	if(i<30)  printf("i=%d  k=%d  ec= %d %d %d \n",i,k,ec1,ec2,ec3,out[(i+8)/7]);*/
 
-	val+= ( (ec1 + ec2 + ec3 + ec4 + ec5 + ec6 + ec7 + ec8 + ec9 ) << k );
+	val=(val + ( (ec1 + ec2 + ec3 + ec4 + ec5 + ec6 + ec7 + ec8 + ec9 ) << k )) & data_mask;
 	}
 }
@@ -139,20 +143,16 @@
 /*******************************************************************************************/
 
-void  com_4(long val,long* in,long*out,int n,int pasin);
-void  com_4_paire(long val1,long val2,long* in,long*out,int n,int pasin);
-
-
-#undef kmax_
-#undef	kmak_
-#undef	emak_		
-#undef	sgbi_
-#undef	sign_
-
-
-#define kmax_	15		/*  valeur maximum de l'exposant	*/
-#define	kmak_	0xf		/*	masque pour l'exposant		*/
-#define	emak_	0xf		/*	masque pour l'ecart		*/		
-#define	sgbi_	0x8		/*	bit de signe de l'ecart		*/
-#define	sign_	0xfffffff0	/*	masque de signe de l'ecart	*/
+void  com_4(unsigned long val,unsigned long* in,unsigned long*out,int n,int pasin);
+void  com_4_paire(unsigned long val1,unsigned long val2,unsigned long* in,unsigned long*out,int n,int pasin);
+
+
+#undef	ecart_mask		
+#define	ecart_mask	0xf		/*	masque pour l'ecart		*/		
+
+#undef	data_mask
+#define	data_mask	0xffff	/* masque pour les données en entree	*/
+#undef	ecart_
+#define	ecart_(i,n,val)		(( (in[(i*7+n)*pasin]&data_mask) | ecart_bit )-val);
+
 
 /*  compress un tableau in de n*7 points disposé avec un pas pasin	*/
@@ -165,7 +165,7 @@
 /*	7*n + 2	==>	n+1	     ==>   pour  72 points :   11 mots  			*/
 
-void compress_4_1(long* in,long*out,int n,int pasin)
-{
-long val1,val2;
+void compress_4_1(unsigned long* in,unsigned long*out,int n,int pasin)
+{
+unsigned long val1,val2;
 val1=in[0];val2=in[1];
 *out=( (val1<<16) & 0xffff0000 )	|	( ( val2 ) & 0xffff ) ;
@@ -176,18 +176,9 @@
 
 
-void  com_4(long val,long* in,long*out,int n,int pasin)
-{
-int filtre[16]={0xffffffff,0xfffffffe,0xfffffffc,0xfffffff8,
-				0xfffffff0,0xffffffe0,0xffffffc0,0xffffff80,
-				0xffffff00,0xfffffe00,0xfffffc00,0xfffff800,
-				0xfffff000,0xffffe000,0xffffc000,0xffff8000};
-int test[16]=  {0x00000000,0x00000001,0x00000002,0x00000004,
-				0x00000008,0x00000010,0x00000020,0x00000040,
-				0x00000080,0x00000100,0x00000200,0x00000400,
-				0x00000800,0x00001000,0x00002000,0x00004000};
-
-long val1;
-long ec1,ec2,ec3,ec4,ec5,ec6,ec7;
-int i,k,k1;long q;
+void  com_4(unsigned long val,unsigned long* in,unsigned long*out,int n,int pasin)
+{
+unsigned long val1;
+unsigned long ec1,ec2,ec3,ec4,ec5,ec6,ec7;
+int i,k,k1;unsigned long q;
 
 
@@ -196,41 +187,41 @@
 	k=0;q=7;	/* 4 bit = 15 = +-7	*/
 
-	ec1=in[i*7*pasin]-val;
+	ec1=ecart_(i,0,val);
 	shif(ec1,k,q);
-	val1=val + arrondi(ec1,k);
+	val1=new_val(val,ec1,k);
 	
 	k1=k;
-	ec2=in[(i*7+1)*pasin]-val1;
+	ec2=ecart_(i,1,val1);
 	shif(ec2,k,q);
 	
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k);}
-	val1+= arrondi(ec2,k);
-
-	ec3=in[(i*7+2)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=(val + arrondi(ec1,k))&data_mask;}
+	val1=new_val(val1,ec2,k);
+
+	ec3=ecart_(i,2,val1);
 	shif(ec3,k,q);
 
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k) + arrondi(ec2,k);}
-	val1+= arrondi(ec3,k);		
-
-	ec4=in[(i*7+3)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=(val + arrondi(ec1,k) + arrondi(ec2,k))&data_mask;}
+	val1=new_val(val1,ec3,k);
+
+	ec4=ecart_(i,3,val1);
 	shif(ec4,k,q);
 
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k);}
-	val1+= arrondi(ec4,k);		
-
-	ec5=in[(i*7+4)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=(val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k))&data_mask;}
+	val1=new_val(val1,ec4,k);
+
+	ec5=ecart_(i,4,val1);
 	shif(ec5,k,q);
 
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k) + arrondi(ec4,k);}
-	val1+= arrondi(ec5,k);		
-	
-	ec6=in[(i*7+5)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=(val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k) + arrondi(ec4,k))&data_mask;}
+	val1=new_val(val1,ec5,k);
+	
+	ec6=ecart_(i,5,val1);
 	shif(ec6,k,q);
 
-	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k)
-					 + arrondi(ec4,k) + arrondi(ec5,k);}
-	val1+= arrondi(ec6,k);		
-	
-	ec7=in[(i*7+6)*pasin]-val1;
+	if(k>k1)	{k1=k;val1=(val + arrondi(ec1,k) + arrondi(ec2,k) + arrondi(ec3,k)
+					 + arrondi(ec4,k) + arrondi(ec5,k))&data_mask;}
+	val1=new_val(val1,ec6,k);
+	
+	ec7=ecart_(i,6,val1);
 	shif(ec7,k,q);
 	
@@ -245,11 +236,11 @@
 	ec7 =  arrondi(ec7,k) >> k;
 
-	out[i]= ((ec1&emak_)<<28) | ((ec2&emak_)<<24) | ((ec3&emak_)<<20) 
-				| ((ec4&emak_)<<16) | ((ec5&emak_)<<12) | ((ec6&emak_)<<8) | ((ec7&emak_)<<4) | k ;
+	out[i]= ((ec1&ecart_mask)<<28) | ((ec2&ecart_mask)<<24) | ((ec3&ecart_mask)<<20) 
+				| ((ec4&ecart_mask)<<16) | ((ec5&ecart_mask)<<12) | ((ec6&ecart_mask)<<8) | ((ec7&ecart_mask)<<4) | k ;
 
 
 /*	if(i<30)  printf("i=%d  k=%d  ec= %d %d %d \n",i,k,ec1,ec2,ec3,out[(i+8)/7]);*/
 
-	val+= ( (ec1 + ec2 + ec3 + ec4 + ec5 + ec6 + ec7 ) << k );
+	val=(val+ ( (ec1 + ec2 + ec3 + ec4 + ec5 + ec6 + ec7 ) << k ))&data_mask;
 	}
 }
@@ -264,8 +255,13 @@
 /*	7*n+2	==>	n+2			==>  pour 72 points :		12 mots								*/
 
-void compress_4_2(long* in,long*out,int n,int pasin)
-{
-long val1,val2;
-val1=in[0];		val2=in[1];
+#undef	data_mask
+#define	data_mask	0x1fffff	/* masque pour les données en entree 21 bit	*/
+#undef	ecart_
+#define	ecart_(i,n,val)		(( (in[(i*7+n)*pasin]&data_mask) | ecart_bit )-val);
+
+void compress_4_2(unsigned long* in,unsigned long*out,int n,int pasin)
+{
+unsigned long val1,val2;
+val1=in[0]&data_mask;		val2=in[1]&data_mask;
 out[0]=val1;	out[1]=val2;
 com_4_paire(val1,val2,in+2,out+2,n/7,pasin);
@@ -273,18 +269,9 @@
 
 
-void  com_4_paire(long val1,long val2,long* in,long*out,int n,int pasin)
-{
-int filtre[16]={0xffffffff,0xfffffffe,0xfffffffc,0xfffffff8,
-				0xfffffff0,0xffffffe0,0xffffffc0,0xffffff80,
-				0xffffff00,0xfffffe00,0xfffffc00,0xfffff800,
-				0xfffff000,0xffffe000,0xffffc000,0xffff8000};
-int test[16]=  {0x00000000,0x00000001,0x00000002,0x00000004,
-				0x00000008,0x00000010,0x00000020,0x00000040,
-				0x00000080,0x00000100,0x00000200,0x00000400,
-				0x00000800,0x00001000,0x00002000,0x00004000};
-
-long val1p,val2p;
-long ec1,ec2,ec3,ec4,ec5,ec6,ec7;
-int i,k,k1;long q;
+void  com_4_paire(unsigned long val1,unsigned long val2,unsigned long* in,unsigned long*out,int n,int pasin)
+{
+unsigned long val1p,val2p;
+unsigned long ec1,ec2,ec3,ec4,ec5,ec6,ec7;
+int i,k,k1;unsigned long q;
 
 
@@ -293,45 +280,45 @@
 	k=0;q=7;	/* 4 bit = 15 = +-7	*/
 
-	ec1=in[i*7*pasin]-val1;
+	ec1=ecart_(i,0,val1);
 	shif(ec1,k,q);
 	
-	ec2=in[(i*7+1)*pasin]-val2;
+	ec2=ecart_(i,1,val2);
 	shif(ec2,k,q);
 	
 	k1=k;
-	val1p=val1 + arrondi(ec1,k);
-
-
-	ec3=in[(i*7+2)*pasin]-val1p;
+	val1p=new_val(val1,ec1,k);
+
+
+	ec3=ecart_(i,2,val1p);
 	shif(ec3,k,q);
 
-	val2p=val2 + arrondi(ec2,k);
-
-	ec4=in[(i*7+3)*pasin]-val2p;
+	val2p=new_val(val2,ec2,k);
+
+	ec4=ecart_(i,3,val2p);
 	shif(ec4,k,q);
 
-	if(k>k1)	{k1=k;val1p=val1 + arrondi(ec1,k);val2p = val2 + arrondi(ec2,k);}
-	
-	val1p+= arrondi(ec3,k);		
-
-	ec5=in[(i*7+4)*pasin]-val1p;
+	if(k>k1)	{k1=k;val1p=new_val(val1,ec1,k);val2p=new_val(val2,ec2,k);}
+	
+	val1p=new_val(val1p,ec3,k);		
+
+	ec5=ecart_(i,4,val1p);
 	shif(ec5,k,q);
 
 	if(k>k1)	{	k1=k;
-				val1p=val1 + arrondi(ec1,k) + arrondi(ec3,k);
-				val2p=val2 + arrondi(ec2,k);
+				val1p=(val1 + arrondi(ec1,k) + arrondi(ec3,k))&data_mask;
+				val2p=(val2 + arrondi(ec2,k))&data_mask;
 				}
-	val2p+= arrondi(ec4,k);		
-	
-	ec6=in[(i*7+5)*pasin]-val2p;
+	val2p=new_val(val2p,ec4,k);		
+	
+	ec6=ecart_(i,5,val2p);
 	shif(ec6,k,q);
 
 	if(k>k1)	{	k1=k;
-				val1p=val1 + arrondi(ec1,k) + arrondi(ec3,k);
-				val2p=val2 + arrondi(ec2,k) + arrondi(ec4,k);
+				val1p=(val1 + arrondi(ec1,k) + arrondi(ec3,k))&data_mask;
+				val2p=(val2 + arrondi(ec2,k) + arrondi(ec4,k))&data_mask;
 				}
-	val1p+= arrondi(ec5,k);		
-	
-	ec7=in[(i*7+6)*pasin]-val1p;
+	val1p=new_val(val1p,ec5,k);		
+	
+	ec7=ecart_(i,6,val1p);
 	shif(ec7,k,q);
 	
@@ -346,12 +333,12 @@
 	ec7 =  arrondi(ec7,k) >> k;
 
-	out[i]= ((ec1&emak_)<<28) | ((ec2&emak_)<<24) | ((ec3&emak_)<<20) 
-				| ((ec4&emak_)<<16) | ((ec5&emak_)<<12) | ((ec6&emak_)<<8) | ((ec7&emak_)<<4) | k ;
+	out[i]= ((ec1&ecart_mask)<<28) | ((ec2&ecart_mask)<<24) | ((ec3&ecart_mask)<<20) 
+				| ((ec4&ecart_mask)<<16) | ((ec5&ecart_mask)<<12) | ((ec6&ecart_mask)<<8) | ((ec7&ecart_mask)<<4) | k ;
 
 
 /*	if(i<30)  printf("i=%d  k=%d  ec= %d %d %d \n",i,k,ec1,ec2,ec3,out[(i+8)/7]);*/
 
-	val1p = val1 + ( (ec1 + ec3 + ec5 + ec7 ) << k );
-	val1= val2 + ( (ec2 + ec4	+ ec6 ) << k );
+	val1p = (val1 + ( (ec1 + ec3 + ec5 + ec7 ) << k ))&data_mask;
+	val1= (val2 + ( (ec2 + ec4	+ ec6 ) << k ))&data_mask;
 	val2 = val1p;
 	}
@@ -368,55 +355,44 @@
 /*******************************************************************************************/
 
-
-void  compress_7(long val,long* in,long*out,int n,int pasin);
-void  compress_7_paire(long val1,long val2,long* in,long*out,int n,int pasin);
-
-
-#undef kmax_
-#undef	kmak_
-#undef	emak_		
-#undef	sgbi_
-#undef	sign_
-
-
-
-#define kmax_	15		/*  valeur maximum de l'exposant	*/
-#define	kmak_	0xf		/*	masque pour l'exposant		*/
-#define	emak_	0x7f		/*	masque pour l'ecart		*/		
-#define	sgbi_	0x40		/*	bit de signe de l'ecart		*/
-#define	sign_	0xffffff80	/*	masque de signe de l'ecart	*/
-
-
-/*  comprime	4*n points  : 1er point dans 1er mot, tous les ecarts dans les n mots suivants		*/ 
+/*******************************************************************************************/
+
+/*  compresse en 7 bit mais par paire (pour data provenant de la detection synchrone      */
+
+/* ne prend que les 21 bit de poid faible dans le mot en entree			*/
+/*  comprime	4*n points  : 1er et 2eme point dans 1er mot (16 bit chacun),  suite dans n mots		*/
+/*		différences entre valeures paires  et entre valeures impaires uniquement			*/ 
 /*	4*n	==>	n+1	*/
 
-void compress_7_1(long* in,long*out,int n,int pasin)
-{
-long val;
-val=*in;
-*out=val;
-compress_7(val,in,out+1,n/4,pasin);
-}
-
-
-
-/*  compress un tableau in de n*4 points disposé avec un pas pasin	*/
-/*  les data compressées sont ecrites dans le tableau out de n points	*/
-/*  la valeur val est la valeur de reference du point origine	*/
-
-void  compress_7(long val,long* in,long*out,int n,int pasin)
-{
-int filtre[16]={0xffffffff,0xfffffffe,0xfffffffc,0xfffffff8,
-				0xfffffff0,0xffffffe0,0xffffffc0,0xffffff80,
-				0xffffff00,0xfffffe00,0xfffffc00,0xfffff800,
-				0xfffff000,0xffffe000,0xffffc000,0xffff8000};
-int test[16]=  {0x00000000,0x00000001,0x00000002,0x00000004,
-				0x00000008,0x00000010,0x00000020,0x00000040,
-				0x00000080,0x00000100,0x00000200,0x00000400,
-				0x00000800,0x00001000,0x00002000,0x00004000};
-
-long val1;
-long ec1,ec2,ec3,ec4;
-int i,k,k1;long q;
+
+
+void  compress_7_paire(unsigned long val1,unsigned long val2,unsigned long* in,unsigned long*out,int n,int pasin);
+
+#undef	data_mask
+#define	data_mask	0x1fffff	/* masque pour les données en entree 21 bit	*/
+#undef	ecart_mask		
+#define	ecart_mask		0x7f		/*	masque pour l'ecart 7 bits		*/		
+
+#undef	 ecart_
+#define	ecart_(i,n,val)		(( (in[(i*4+n)*pasin]&data_mask) | ecart_bit )-val);
+
+
+void compress_7_2(unsigned long* in,unsigned long*out,int n,int pasin)
+{
+unsigned long val1,val2;
+val1=in[0]&0x1fffe0;val2=in[pasin]&0x1fffe0;
+*out=( (val1<<11) & 0xffff0000 )	|	( (val2 >> 5) & 0xffff ) ;
+
+/*printf("in[0]=%x  val1=%x        in[1]=%x   val2=%x  \n",in[0],val1,in[1],val2);
+printf("in[2]=%x    in[3]=%x   \n",in[2],in[3]);*/
+compress_7_paire(val1,val2,in,out+1,n/4,pasin);
+}
+
+
+void  compress_7_paire(unsigned long val1,unsigned long val2,unsigned long* in,unsigned long*out,int n,int pasin)
+{
+
+unsigned long val1p,val2p;
+unsigned long ec1,ec2,ec3,ec4;
+int i,k;unsigned long q;
 
 
@@ -425,26 +401,14 @@
 	k=0;q=63;		/* 7 bit ->  127  ->   +-63	*/
 
-	ec1=in[i*4*pasin]-val;
-	shif(ec1,k,q);
-	val1=val + arrondi(ec1,k);
-	
-	k1=k;
-	ec2=in[(i*4+1)*pasin]-val1;
-	shif(ec2,k,q);
-	
-/*	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k);}	*/
-	val1+= arrondi(ec2,k);
-
-	ec3=in[(i*4+2)*pasin]-val1;
-	shif(ec3,k,q);
-
-/*	if(k>k1)	{k1=k;val1=val + arrondi(ec1,k) + arrondi(ec2,k);}	*/
-	val1+= arrondi(ec3,k);		
-
-	ec4=in[(i*4+3)*pasin]-val1;
-	shif(ec4,k,q);
-	
-/*printf("i=%d  k=%d  ec= %d %d %d \n",i,k,ec1,ec2,ec3,out[(i+8)/7]);	*/
-
+	ec1=ecart_(i,0,val1);	shif(ec1,k,q);	
+	
+	ec2=ecart_(i,1,val2);	shif(ec2,k,q);
+	val1p =new_val(val1,ec1,k);
+
+	ec3=ecart_(i,2,val1p);	shif(ec3,k,q);
+	val2p=new_val(val2,ec2,k);
+
+	ec4=ecart_(i,3,val2p);	shif(ec4,k,q);
+	
 	ec1 =  arrondi(ec1,k) >> k;
 	ec2 =  arrondi(ec2,k) >> k;
@@ -452,91 +416,14 @@
 	ec4 =  arrondi(ec4,k) >> k;
 
-	out[i]= ((ec1&emak_)<<25) | ((ec2&emak_)<<18) | ((ec3&emak_)<<11) | ((ec4&emak_)<<4) | k ;
-
-/*	if(i<30)  printf("i=%d  k=%d  ec= %d %d %d \n",i,k,ec1,ec2,ec3,out[(i+8)/7]);	*/
-
-	val+= ( (ec1 + ec2 + ec3 + ec4 ) << k );
+	out[i]= ((ec1&ecart_mask)<<25) | ((ec2&ecart_mask)<<18) | ((ec3&ecart_mask)<<11) | ((ec4&ecart_mask)<<4) | k ;
+
+	/*if(i<5)  printf("i=%d  k=%d  ec= %x %x %x %x  out=%x \n",i,k,ec1,ec2,ec3,ec4,out[i]);	*/
+
+	val1=(val1+ ( (ec1 + ec3 ) << k ))&data_mask;
+	val2=(val2+ ( (ec2 + ec4 ) << k ))&data_mask;
 	}
 }
 
 
-/*******************************************************************************************/
-
-/*  compresse en 7 bit mais par paire (pour data provenant de la detection synchrone      */
-
-/* ne prend que les 21 bit de poid faible dans le mot en entree			*/
-/*  comprime	4*n points  : 1er et 2eme point dans 1er mot (16 bit chacun),  suite dans n mots		*/
-/*		différences entre valeures paires  et entre valeures impaires uniquement			*/ 
-/*	4*n	==>	n+1	*/
-
-#define  point_in(i,pasin,n)  (in[(i*4+n)*pasin]&0x1fffff)
-
-
-void compress_7_2(long* in,long*out,int n,int pasin)
-{
-long val1,val2;
-val1=in[0]&0x1fffe0;val2=in[1]&0x1fffe0;
-*out=( (val1<<11) & 0xffff0000 )	|	( (val2 >> 5) & 0xffff ) ;
-
-/*printf("in[0]=%x  val1=%x   //    in[1]=%x   val2=%x  \n",in[0],val1,in[1],val2);
-printf("in[2]=%x    in[3]=%x   \n",in[2],in[3]);*/
-compress_7_paire(val1,val2,in,out+1,n/4,pasin);
-}
-
-
-void  compress_7_paire(long val1,long val2,long* in,long*out,int n,int pasin)
-{
-int filtre[16]={0xffffffff,0xfffffffe,0xfffffffc,0xfffffff8,
-				0xfffffff0,0xffffffe0,0xffffffc0,0xffffff80,
-				0xffffff00,0xfffffe00,0xfffffc00,0xfffff800,
-				0xfffff000,0xffffe000,0xffffc000,0xffff8000};
-int test[16]=  {0x00000000,0x00000001,0x00000002,0x00000004,
-				0x00000008,0x00000010,0x00000020,0x00000040,
-				0x00000080,0x00000100,0x00000200,0x00000400,
-				0x00000800,0x00001000,0x00002000,0x00004000};
-
-long val1p,val2p;
-long ec1,ec2,ec3,ec4;
-int i,k;long q;
-
-
-for(i=0;i<n;i++)
-	{
-	k=0;q=63;		/* 7 bit ->  127  ->   +-63	*/
-
-	ec1=point_in(i,pasin,0)-val1;
-	shif(ec1,k,q);
-	
-	
-	ec2=point_in(i,pasin,1)-val2;
-	shif(ec2,k,q);
-		
-	val1p =val1 + arrondi(ec1,k);
-
-	ec3=point_in(i,pasin,2)-val1p;
-	shif(ec3,k,q);
-
-	val2p=val2+ arrondi(ec2,k);
-
-	ec4=point_in(i,pasin,3)-val2p;
-	shif(ec4,k,q);
-	
-/*printf("i=%d  k=%d  ec= %d %d %d \n",i,k,ec1,ec2,ec3,out[(i+8)/7]);	*/
-
-	ec1 =  arrondi(ec1,k) >> k;
-	ec2 =  arrondi(ec2,k) >> k;
-	ec3 =  arrondi(ec3,k) >> k;
-	ec4 =  arrondi(ec4,k) >> k;
-
-	out[i]= ((ec1&emak_)<<25) | ((ec2&emak_)<<18) | ((ec3&emak_)<<11) | ((ec4&emak_)<<4) | k ;
-
-/*	if(i<5)  printf("i=%d  k=%d  ec= %x %x %x %x  out=%x \n",i,k,ec1,ec2,ec3,ec4,out[i]);*/	
-
-	val1+= ( (ec1 + ec3 ) << k );
-	val2+= ( (ec2 + ec4 ) << k );
-	}
-}
-
-
-
-
+
+
Index: /trunk/Poubelle/archediab.old/archediab.sources/c/decompress.c
===================================================================
--- /trunk/Poubelle/archediab.old/archediab.sources/c/decompress.c	(revision 656)
+++ /trunk/Poubelle/archediab.old/archediab.sources/c/decompress.c	(revision 657)
@@ -9,9 +9,9 @@
 //*******************************************************************************************
 
+#define	ecart_mask		0x7	/*	masque pour l'ecart		*/		
+
 void  decom_3(long val,long* in,long*out,int n);
 
-#define kmax_	15		/*  valeur maximum de l'exposant	*/
-#define	kmak_	0xf		/*	masque pour l'exposant		*/
-#define	emak_	0x7		/*	masque pour l'ecart		*/		
+#define	k_mask	0xf		/*	masque pour l'exposant		*/
 #define	sgbi_	0x4		/*	bit de signe de l'ecart		*/
 #define	sign_	0xfffffff8	/*	masque de signe de l'ecart	*/
@@ -43,5 +43,5 @@
 	{
 	R=in[i];
-	k=R&kmak_;
+	k=R&k_mask;
 	recup(ec1,29,k); 
 	recup(ec2,26,k); 
@@ -77,7 +77,6 @@
 void  decom_4_paire(long val1,long val2,long* in,long*out,int n);
 
-#undef kmax_
-#undef	kmak_
-#undef	emak_		
+#undef	ecart_mask		
+#define	ecart_mask	0xf		/*	masque pour l'ecart		*/		
 #undef	sgbi_
 #undef	sign_
@@ -85,7 +84,5 @@
 
 
-#define kmax_	15		/*  valeur maximum de l'exposant	*/
-#define	kmak_	0xf		/*	masque pour l'exposant		*/
-#define	emak_	0xf		/*	masque pour l'ecart		*/		
+#define	k_mask	0xf		/*	masque pour l'exposant		*/
 #define	sgbi_	0x8		/*	bit de signe de l'ecart		*/
 #define	sign_	0xfffffff0	/*	masque de signe de l'ecart	*/
@@ -118,5 +115,5 @@
 	{
 	R=in[i];
-	k=R&kmak_;
+	k=R&k_mask;
 	recup(ec1,28,k); 
 	recup(ec2,24,k); 
@@ -165,5 +162,5 @@
 	{
 	R=in[i];
-	k=R&kmak_;
+	k=R&k_mask;
 	recup(ec1,28,k); 
 	recup(ec2,24,k); 
@@ -195,16 +192,10 @@
 //*******************************************************************************************
 
-
-#undef kmax_
-#undef	kmak_
-#undef	emak_		
 #undef	sgbi_
 #undef	sign_
 
 
-
-#define kmax_	15		/*  valeur maximum de l'exposant	*/
-#define	kmak_	0xf		/*	masque pour l'exposant		*/
-#define	emak_	0x7f		/*	masque pour l'ecart		*/		
+#undef	ecart_mask		
+#define	ecart_mask		0x7f		/*	masque pour l'ecart 7 bits		*/		
 #define	sgbi_	0x40		/*	bit de signe de l'ecart		*/
 #define	sign_	0xffffff80	/*	masque de signe de l'ecart	*/
@@ -239,5 +230,5 @@
 	{
 	R=in[i];
-	k=R&kmak_;
+	k=R&k_mask;
 	recup(ec1,25,k); 
 	recup(ec2,18,k); 
@@ -282,5 +273,5 @@
 	{
 	R=in[i];
-	k=R&kmak_;
+	k=R&k_mask;
 	recup(ec1,25,k); 
 	recup(ec2,18,k); 
@@ -293,8 +284,8 @@
 	val2+=ec4;	out[4*i+3]=val2;	 
 
-/*if(i<5)  printf("in=%x  i=%d  k=%d  ec= %x %x %x %x  \n",R,i,k,ec1,ec2,ec3,ec4);	*/
-
-	}
-}
-
-
+/*if(i<5)  printf("in=%x  i=%d  k=%d  ec= %x %x %x %x  \n",R,i,k,ec1,ec2,ec3,ec4);*/	
+
+	}
+}
+
+
Index: /trunk/Poubelle/archediab.old/archediab.sources/c/diabolo.c
===================================================================
--- /trunk/Poubelle/archediab.old/archediab.sources/c/diabolo.c	(revision 656)
+++ /trunk/Poubelle/archediab.old/archediab.sources/c/diabolo.c	(revision 657)
@@ -92,4 +92,5 @@
 #endif
 
+
 #ifdef _archeops
 //nouveauD(fenetre_vitesse_block,config_transputer_id,"config_transputer",exec_config_transputer);
@@ -117,5 +118,5 @@
 			printf(" capa=%g ",capa(j+1));
 			printf(" boloutil = %d  bolonom = %s  \n",parametr.bolo[j].bolo_code_util,parametr.nom_coef[parametr.bolo[j].numero_nom_coef].bolo_nom);
-			if( parametr.bolo[j].bolo_code_util==bolo_normal_transmis)		parametr.nb_bolo++;
+			if( parametr.bolo[j].bolo_code_util&bolo_transmis_comprime)		parametr.nb_bolo++;
 			if(parametr.bolo[j].bolo_code_util)
 				{
Index: /trunk/Poubelle/archediab.old/archediab.sources/c/dilution.c
===================================================================
--- /trunk/Poubelle/archediab.old/archediab.sources/c/dilution.c	(revision 656)
+++ /trunk/Poubelle/archediab.old/archediab.sources/c/dilution.c	(revision 657)
@@ -235,5 +235,5 @@
 for(j=0;(j<nb_max_bolo) && (k<4);j++)
 	{
-	if(parametr.bolo[j].bolo_code_util==bolo_thermo_simplifie)
+	if(parametr.bolo[j].bolo_code_util&bolo_thermo_simplifie)
 		{
 		I = 1e-3 * (double)dac_V(gg->reglage.bolo[j]) * 2441. / parametr.bolo[j].bolo_capa;	//	I en µA
Index: /trunk/Poubelle/archediab.old/archediab.sources/h/compress.h
===================================================================
--- /trunk/Poubelle/archediab.old/archediab.sources/h/compress.h	(revision 656)
+++ /trunk/Poubelle/archediab.old/archediab.sources/h/compress.h	(revision 657)
@@ -17,5 +17,5 @@
 /*	pour 	n = 72	  en sortie	19 mots = 76 octets		*/
 
-void compress_7_1(long* in,long*out,int n,int pasin);
+void compress_7_1(unsigned long* in,unsigned long*out,int n,int pasin);
 void decompress_7_1(long* in,long*out,int n);
 
@@ -29,5 +29,5 @@
 /*	pour 	n = 72	  en sortie	11 mots = 44 octets		*/
 
-void compress_4_1(long* in,long*out,int n,int pasin);
+void compress_4_1(unsigned long* in,unsigned long*out,int n,int pasin);
 void decompress_4_1(long* in,long*out,int n);
 
@@ -42,5 +42,5 @@
 
 
-void compress_3_1(long* in,long*out,int n,int pasin);
+void compress_3_1(unsigned long* in,unsigned long*out,int n,int pasin);
 void decompress_3_1(long* in,long*out,int n);
 
@@ -63,5 +63,5 @@
 
 
-void compress_7_2(long* in,long*out,int n,int pasin);
+void compress_7_2(unsigned long* in,unsigned long*out,int n,int pasin);
 void decompress_7_2(long* in,long*out,int n);
 
@@ -78,5 +78,5 @@
 
 
-void compress_4_2(long* in,long*out,int n,int pasin);
+void compress_4_2(unsigned long* in,unsigned long*out,int n,int pasin);
 void decompress_4_2(long* in,long*out,int n);
 
@@ -89,9 +89,17 @@
 /************************************************************************/
 
-/*Les valeures de la table d'entree sont consideres comme toujopurs positives	*/
-/* les ecarts sont calculés signés sur 32 bit avant d'etre tronconnés		*/
+/*	tous les nombres sont des entiers unsigned long pour compress				*/
+/*Les valeures de la table d'entree sont consideres comme toujours positives et sur 21 bits	*/
+/*  les valeurs de reference pour le calcul des ecarts sont augmentees de ecart_bit=0x10000000	*/
+/*	LES ECARTS SONT DES ENTIERS POSITIFS (ecart_bit +  valeur courante - valeur precedente) */
 
-#define	shif(ec,k,q)	{while(ec>q)if(k<kmax_){k++;q<<=1;}else ec=q;while(ec<-q)if(k<kmax_){k++;q<<=1;}else ec=-q;}
-#define	recup(ec,sss,k) {ec=((R>>sss)&emak_);if(ec & sgbi_ ) ec|= sign_ ; ec<<=k;}
-#define	arrondi(ec,k)	((ec &  filtre[k]) +( (ec & test[k]) <<1 ) )	
+/*  pour tous les compresseurs	*/
+#define kmax_	15		/*  valeur maximum de l'exposant	*/
+#define	ecart_bit	0x10000000
+#define	shif(ec,k,q)	{while(ec>(q|ecart_bit))if(k<kmax_){k++;q<<=1;}else ec=(q|ecart_bit);while(ec<ecart_bit-q)if(k<kmax_){k++;q<<=1;}else ec=ecart_bit-q;}
+#define	arrondi(ec,k)	((ec &  filtre[k]) +( (ec & test[k]) <<1 ) ) /* resultat sur 28 bit  */	
+#define new_val(val,ec,k)	((val + arrondi(ec,k))&data_mask);
 
+/* pour les decompresseurs	*/
+#define	recup(ec,sss,k) {ec=((R>>sss)&ecart_mask);if(ec & sgbi_ ) ec|= sign_ ; ec<<=k;}
+
Index: /trunk/Poubelle/archediab.old/archeops.c
===================================================================
--- /trunk/Poubelle/archediab.old/archeops.c	(revision 656)
+++ /trunk/Poubelle/archediab.old/archeops.c	(revision 657)
@@ -1,542 +1,284 @@
-
 
 #include "manip.h"      
-
 #include "archeops.h"
 
-
-
 /* sauve vol trapani 2eme config de vol   */
 
-
-
 /**********  coefficients  pour  les  mesures  bolo    **********************************/
-
 /*                         toutes les puissances en pW                                  */
-
 /*	-1-	loi de reponse thermique des bolos  avec R en ohms et T en Kelvin               */
-
 /*                                                                                      */
-
 /* 	T =  coef2  *   (   ln (  R / coef1) **  ( -1 / coef0 )                             */
-
 /*                                                                                      */
-
 /*	-2-	fuite thermique du bolo   coef 3,4                                              */
-
 /*                                                                                      */
-
 /*	Ptot =  coef3  *  ( (10*Tb) ** coef4    -    (10*Tcryo)  **  coef4 )                */
-
 /*                                                                                      */
-
 /*	-3-	calcul empirique de Pciel et de  tau	  coef  5,6                             */
-
 /*                                                                                      */
-
 /*	Pciel	=	coef5	- Pelec		coef5= I * Ai (tables xavier) 	                    */
-
 /*	tau	=	- ln ( 1 +  Pciel / coef6 )	coef6= I * Bi (tables xavier)                   */
-
 /*   										                                            */
-
 /* Pour les thermometres 1 à 4 (germanium et carbone Allan-Bradley) 		            */
-
 /* les coefficients sont utilisés differemment, ils permettent de convertir	            */
-
 /* R vers T		( c(6) est un offset sur la mesure de R par rapport  aux mesures 4 fils)*/
-
 /*   llR= log(log(R - c(6))-c(0))  						                                */
-
 /*    T	= exp(c(1) + c(2)* llR + c(3)* llR* llR + c(4)* llR* llR* llR +                 */
-
 /*            c(5)* llR* llR* llR* llR)                                                 */
-
 /*										                                                */
-
 /*	version vol Trapani									                                */
-
 /*	on corrige le biais de temperature coef2=1.1 old,  coef3=old/1.1^coef4	            */
-
 /*										                                                */
-
 /*										                                                */
-
 /*										                                                */
-
 /*										                                                */
-
 /*										                                                */
-
 /****************************************************************************************/
 
 
-
-
-
 /**************************************************************************************/
-
 /*                                                                                    */
-
 /*   pour les MLPA      :  gain = 100   diviseur = 101  ou  330                       */
-
 /*   pour les bebodiff  :  gain = diviseur = 100Kohm / R preampli                     */
-
 /*   pour les bebodiff  :  la capa est corrigee d'un facteur 0.868                    */
-
 /*   pour les cartes modifiees : mettre diviseur=0                                    */
-
 /*                         et capa = la resistance de chage en Megohm                 */
-
 /*                                                                                    */
-
 /**************************************************************************************/
 
 
-
-
-
 /*  numero_nom,  on/off  ,  0 = MLPA       , N° bolo , gain_pa  , capa*1000 , diviseur , coef*10000 */
-
 /*       ,  0 ou 1  ,  2..8 = BEBO    ,  hard   ,           ,  4700     ,  333     , 		*/
-
 /*                     10 = Bediff    ,         ,           , 					*/
 
-
-
 /* pour les bediff (code 10)  le n° de bolo est  N° de bebo*8  +  numero dans la bebo		*/
-
 /*  soit :  1 2 3 4 5 6  ..  9 10 11 12 13 14 .. 17 18 19 20 21 22 .. etc			*/
 
 
-
-
-
 /*debut_param*/
-
 /*----------------------------------  fenetre :  -----------------------------------*/
 
-
-
 /* ------------------------ configuration de vol 5 juillet 99-----------------------------*/
-
 /* ---------------------- modifié les indices de bolo  le 15 septembre 1999-------------------*/
-
-param_bolo  parametr={29,24,36,88,18,
-
-
+/*  contient au debut :  numero_version,n_max_bolo,n_per_block,n_max_mes_per,nb_bolo	*/
+
+
+param_bolo  parametr={29,36,36,88,0,
+
+/*  dans l'ordre :						*/
+/* 1-	numero des caracteristiques du bolo			*/
+/* 2-	transmission du bolo  (normal = 7)  (non transmis =  5) (thermo = 9)	*/
+/* 3-	10 = bebo  differentielle				*/
+/* 4-	numero de la voie de commande (8*n°bebo + N° dans la bebo)	*/
+/* 5-	gain du preamplificateur				*/
+/* 6-	capacite de modulation (en fF)				*/
+/* 7-	diviseur pour la modulation				*/
 
 { 
-
-{ 11 	, 2,10, 1 , 200, 22000	,  200 },	/*	0	*/
-
-{  9	, 1,10, 2 , 200, 22000	,  200 },
-
-{  8 	, 1,10, 3 , 200, 22000	,  200 },
-
-{ 14 	, 2,10, 4 , 200, 22000	,  200 },
-
-
-
-{  5	, 1,10, 5 ,1000,  4700	, 1000 },	/*	4	*/
-
-{  0 	, 2,10, 6 ,1000,  4700	, 1000 },
-
-{ 10	, 1,10, 9 ,1000,  4700	, 1000 },
-
-{  0 	, 2,10,10, 1000,  4700	, 1000 },
-
-
-
-{  2 	, 1,10,11, 1000,  4700	, 1000 },	/*	8	*/
-
-{  4	, 1,10,12, 1000,  4700	, 1000 },
-
-{  7 	, 2,10,13, 1000,  4700	, 1000 },
-
-{  1 	, 1,10,14, 1000,  4700	, 1000 },
-
-
-
-{ 13	, 1,10,17, 1000,  4700	, 1000 },	/*	12	*/
-
-{  3	, 1,10,18, 1000,  4700	, 1000 },
-
+{ 11 	, 5,10, 1 , 200, 22000	,  200 },	/*	0	*/
+{  9	, 7,10, 2 , 200, 22000	,  200 },
+{  8 	, 7,10, 3 , 200, 22000	,  200 },
+{ 14 	, 5,10, 4 , 200, 22000	,  200 },
+
+{  5	, 7,10, 5 ,1000,  4700	, 1000 },	/*	4	*/
+{  0 	, 5,10, 6 ,1000,  4700	, 1000 },
+{ 10	, 7,10, 9 ,1000,  4700	, 1000 },
+{  0 	, 5,10,10, 1000,  4700	, 1000 },
+
+{  2 	, 7,10,11, 1000,  4700	, 1000 },	/*	8	*/
+{  4	, 7,10,12, 1000,  4700	, 1000 },
+{  7 	, 5,10,13, 1000,  4700	, 1000 },
+{  1 	, 7,10,14, 1000,  4700	, 1000 },
+
+{ 13	, 7,10,17, 1000,  4700	, 1000 },	/*	12	*/
+{  3	, 7,10,18, 1000,  4700	, 1000 },
 { 12    	, 1,10,19, 1000,  4700	, 1000 },
-
-{  6	, 1,10,20, 1000,  4700	, 1000 },
-
-
-
-{ 15	, 1,10,21,  200, 22000	,  200 },	/*	16	*/
-
-{ 16	, 1,10,22,  200, 22000	,  200 },
-
-{ 17	, 1,10,25,  500, 22000  ,  500 },
-
-{ 18	, 2,10,26,  500, 22000  ,  500 },
-
-
-
-{ 20	, 3,10,27, 1000, 22000	,    0 },	/*	20	*/
-
-{ 21	, 3,10,28, 1000,  1000	,    0 },
-
-{ 22	, 3,10,29, 1000,  1000	,    0 },
-
-{ 23	, 3,10,30, 1000,  1000	,    0 },
-
-
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },	/*	24	*/
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },
-
-
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },	/*	28	*/
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },
-
-
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },	/*	32	*/
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },
-
-{ 0	, 3,10,30, 1000,  1000	,    0 },
-
-
+{  6	, 7,10,20, 1000,  4700	, 1000 },
+
+{ 15	, 7,10,21,  200, 22000	,  200 },	/*	16	*/
+{ 16	, 7,10,22,  200, 22000	,  200 },
+{ 17	, 7,10,25,  500, 22000  ,  500 },
+{ 18	, 5,10,26,  500, 22000  ,  500 },
+
+{ 20	, 9,10,27, 1000, 22000	,    0 },	/*	20	*/
+{ 21	, 9,10,28, 1000,  1000	,    0 },
+{ 22	, 9,10,29, 1000,  1000	,    0 },
+{ 23	, 9,10,30, 1000,  1000	,    0 },
+
+{ 0	, 0,10,30, 1000,  1000	,    0 },	/*	24	*/
+{ 0	, 0,10,30, 1000,  1000	,    0 },
+{ 0	, 0,10,30, 1000,  1000	,    0 },
+{ 0	, 0,10,30, 1000,  1000	,    0 },
+
+{ 0	, 0,10,30, 1000,  1000	,    0 },	/*	28	*/
+{ 0	, 0,10,30, 1000,  1000	,    0 },
+{ 0	, 0,10,30, 1000,  1000	,    0 },
+{ 0	, 0,10,30, 1000,  1000	,    0 },
+
+{ 0	, 0,10,30, 1000,  1000	,    0 },	/*	32	*/
+{ 0	, 0,10,30, 1000,  1000	,    0 },
+{ 0	, 0,10,30, 1000,  1000	,    0 },
+{ 0	, 0,10,30, 1000,  1000	,    0 },
 
 },
-
 { 
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },			/*	0	*/
-
 { "ch1-bolo1"  , { 5000  ,  600000 , 154000,  63039, 25000, 0, 0}  },		/*	1	*/	
-
 { "ch1-bolo2"  , { 5000  ,  600000 , 154000,  47279, 25000, 0, 0}  },
-
 { "ch1-bolo3"  , { 5000  ,  600000 , 154000,  51219, 25000, 0, 0}  },
-
 { "ch2-bolo4"  , { 5000  ,  600000 , 154000,  70919, 25000, 0, 0}  },
-
 { "ch2-bolo5"  , { 5000  ,  600000 , 154000,  78799, 25000, 0, 0}  },	
-
 { "ch3-bolo6"  , { 5000  ,  600000 , 154000,  86678, 25000, 0, 0}  },
 
-
-
 { "Dum100mK1"  , { 5000  ,  588000 , 125000,  0,0,0,0} },			        /*	7	*/
-
 { "Dum100mK2"  , { 5000  ,  588000 , 125000,  0,0,0,0} },
-
 /*{ "Dum100mK3"  , { 5000  , 1361800 , 125000,  0,0,0,0} },		*/
-
 { "Dum100mK4"  , { 5000  , 1361800 , 125000,  0,0,0,0} },		            /* 9 */
-
 /*{ "Dum100mK5"  , { 5000  , 1361800 , 125000,  0,0,0,0} },		*/
-
 { "Dum100mK6"  , { 5000  , 1361800 , 125000,  0,0,0,0} },		
 
-
-
 { "Lou100mK1"  , { 5000  , 5680000 , 560000,  0,0,0,0} },                   /* 11 */
-
 { "Lou100mK2"  , { 5000  , 5680000 , 560000,  0,0,0,0} },
-
 { "Lou100mK3"  , { 5000  , 5680000 , 560000,  0,0,0,0} },
-
 { "Lou100mK4"  , { 5000  , 5680000 , 560000,  0,0,0,0} },
 
-
-
 { "Lou1.6K5 "  , { 5000  ,  0 , 0,   0,0,0,0} },        					/*	15	*/
-
 { "Lou1.6K6 "  , { 5000  ,  0 , 0,   0,0,0,0} },  
-
 { "Lou10K7  "  , { 5000  ,  0 , 0,   0,0,0,0} },  
-
 { "Lou10K8  "  , { 5000  ,  0 , 0,   0,0,0,0} }, 
 
-
-
 { "R10MOhm  "  , { 5000  ,  0 , 0,   0,0,0,0} },  							/*	19	*/
 
-
-
 /* La germanium doit toujours etre en premier par rapport aux autres thermos absolus */
-
 { "germanium"  , {     0 ,  30719 ,   -910 , -16389 , 2927 ,   0,      0} }, /*	20	*/
-
 { "therm_4k"   , { 45000 ,  28907 , -16028 ,  -1327 , 1472 , 872,  52500} },
-
 { "therm_1.6k" , { 45000 ,  28907 , -16028 ,  -1327 , 1472 , 872, 566700} },
-
 { "therm_10k"  , { 45000 ,  28907 , -16028 ,  -1327 , 1472 , 872, 138100} },
 
-
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },			/*	24	*/
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
 
-
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },			/*	28	*/
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
 
-
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },			/*	32	*/
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
 
-
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },			/*	36	*/
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
-
 { "Niente   "    , { 5000  ,  0 , 0,   0,0,0,0} },
 
-
-
 }
 
-
-
 };
-
 /*fin_param*/
 
-
-
 /* Definition Mai-Juin 1999
-
 { 
-
 { "v1-bedif1"  , 1,10,1 ,  200, 22000	,  200,  { 5000  , 123100 , 334200,0,0,0,0} },		
-
 { "v1-bedif2"  , 1,10,2 ,  200, 22000	,  200,  {  500  , 136180 ,   9010,0,0,0,0} },
-
 { "v1-bedif3"  , 1,10,3 ,  200, 22000	,  200,  {  500  , 136180 ,   9010,0,0,0,0} },
-
 { "v1-bedif4"  , 1,10,4 ,  200, 22000	,  200,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "v1-bedif5"  , 1,10,5 , 1000, 4700	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "v1-bedif6"  , 1,10,6 , 1000, 4700	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
 
-
-
 { "v1-bedif7"  , 1,10,9 , 1000, 4700	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "v1-bedif8"  , 1,10,10, 1000, 4700	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "v1-bedif9"  , 1,10,11, 1000, 4700	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "v1-bedif10" , 1,10,12, 1000, 4700	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "v1-bedif11" , 1,10,13, 1000, 4700	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "v1-bedif12" , 1,10,14, 1000, 4700	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
 
-
-
 { "v1-bedif13"	, 1,10,17, 1000, 100000	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "v1-bedif14"	, 1,10,18, 1000, 470000	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "bedif15"  	, 1,10,19, 1000, 470000	, 1000,  {  500  ,  58800 ,  12500,0,0,0,0} },
-
 { "bedif16"	, 1,10,20, 1000,2200000	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "bedif17"	, 1,10,21, 1000, 4700	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "bedif18"	, 1,10,22, 1000, 4700	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
 
-
-
 { "v1-bedif19"	, 2,10,25, 1000, 4700  	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "v1-bedif20"	, 2,10,26, 1000, 4700  	, 1000,  { 5000  , 123100 , 334200,0,0,0,0} },
-
 { "germanium"	, 3,10,27, 1000, 22000	,    0,  { 3500  ,  17100 , 646500,0,0,0,0} },
-
 { "therm_4k"	, 3,10,28, 1000, 1000	,    0,  {12000  ,1804000 ,  72800,0,0,0,0} },
-
 { "therm_1.6k"	, 3,10,29, 1000, 1000	,    0,  {12000  ,1804000 ,  72800,0,0,0,0} },
-
 { "therm_10k"	, 3,10,30, 1000, 1000	,    0,  {12000  ,1804000 ,  72800,0,0,0,0} },
 
-
-
 }*/
 
-
-
 /* bolos campagne 1998-1999	*/
-
 /*
-
 reg_NbSi.J, 1, 0, 1, 100, 4.7, 333,	.5			,519.6  , 8.286
-
 v1-231...L, 1, 0, 2, 100, 4.7, 333, .5   , 1.7   , 32.41 , 0.333 , 10  , 20.30  ,  11.41  		
-
 v1-232...N, 1, 0, 3, 100, 4.7, 333,		
-
 v1-237...E, 1, 0, 4, 100, 4.7, 333,
 
-
-
 reg_JamieO, 1, 0, 5, 100, 4.7, 101,
 
-
-
 V2-NbSi..H, 1, 0, 6, 100, 4.7, 101, .5   ,433.8  , 9.25
-
 V2-230...B, 1, 0, 7, 100, 4.7, 333, .5   , 8.26  , 26.61 , 5.10  ,  7  , 9.354   ,  1.026
-
 V2-205...Q, 1, 0, 8, 100, 4.7, 333,	.518 , 81    , 25.2 
-
 V2-208...P, 1, 0, 9, 100, 4.7, 333, .5   , 12.31 , 33.42 , 0.627 , 6.5 , 8.113   ,  2.958
 
-
-
 */
-
 /*bolos campagne 1997-1998	*/
-
 /*
 
-
-
 v1-208...J, 1, 0, 1, 100, 4.7, 333, .5   , 12.31 , 33.42 		
-
 v1-232...L, 1, 0, 2, 100, 4.7, 333,		
-
 v1-205...N, 1, 0, 3, 100, 4.7, 333,	.518 , 81    , 25.2	
-
 v1-NbSi..E, 1, 0, 4, 100, 4.7, 333,	.5			,519.6  , 8.286
-
 Jamie....O, 1, 0, 5, 100, 4.7, 101,
-
 V2-NbSi..H, 1, 0, 6, 100, 4.7, 101, .5   ,433.8  , 9.25
-
 V2-224...B, 1, 0, 7, 100, 4.7, 333, .5   ,3.43   , 26.6
-
 V2-230...Q, 1, 0, 8, 100, 4.7, 333, .5   , 8.26  , 26.61
-
 V2-231...P, 1, 0, 9, 100, 4.7, 333, .5   , 1.7   , 32.41
 
-
-
 */
 
 
-
-
-
 int mode_transmission_telemesure[nb_modes_telemesure][nb_type_blocks]= {
 
-
-
 /* enregisteur de bord flash :  plafond standard nominal	*/
-
 /* 0*/	{ 0,10,15,50, 10,50, 0, 0, 0, 1, 0, 0, 1, 0, 1,2500, 0, 0, 0, 0},
 
-
-
 /* 1*/	{ 0,10,10, 1, 10, 3, 0, 0, 0, 1, 0, 0, 1, 0, 4,2500, 0, 0, 0, 0},
 
-
-
 /* 2*/	{ 0,10,05,01, 10,06, 0, 0, 0, 1, 0, 0, 1, 0, 2,2500, 0, 0, 0, 0},
 
-
-
 /* 3*/	{ 0,10, 1,25, 10, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0,2500, 0, 0, 0, 0},
 
-
-
 /* 4*/	{ 0,10,15,50, 10,25, 0, 0, 1, 0, 0, 0, 0, 0, 0,2500, 0, 0, 0, 0},
 
-
-
 /* 5*/	{ 0,10,15,50, 10,25, 0, 0, 0, 0, 1, 0, 0, 0, 0,2500, 0, 0, 0, 0},
 
-
-
 /* 6*/	{ 0,10,15,50, 10,50, 0, 0, 0, 1, 0, 0, 1, 0, 2,2500, 0, 0, 0, 0},
 
-
-
 /* 7*/	{ 0,10,15,50,100,50, 1, 1, 0, 1, 0, 0, 1, 0, 1,2500, 0, 0, 0, 0},
 
-
-
 /* 8*/	{ 0,10,15,50,100,50, 1, 1, 1, 0, 0, 0, 0, 0, 0,2500, 0, 0, 0, 0},
 
-
-
 /* 9*/	{ 0,10, 1, 1,100, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0,2500, 0, 0, 0, 0}
 
-
-
  };
 
 
 
-
-
-
-
 int mode_transmission_flash[nb_modes_flash][nb_type_blocks]= {
 
 
-
-
-
 /* enregisteur de bord flash : nominal	*/
-
 /* 0*/	{ 0,50,15,25, 10,25, 0, 0, 0, 1, 0, 0, 1, 0, 1,2500, 0, 0, 0, 0} ,
 
-
-
 /* enregisteur de bord flash : minimum	*/
-
 /* 1*/	{ 0,50,50,50,50,100, 0, 0, 0, 0, 0, 0, 0, 0, 0,2500, 0, 0, 0, 0} ,
 
-
-
 /* enregisteur de bord flash :  rien	*/
-
 /* 2*/	{ 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0} };
 
@@ -544,27 +286,13 @@
 
 
-
-
-
-
-
 /*debut_nom_reglage*/
-
 /* 0->1 - demarrage par defaut - Nominal*/
-
 /* 1->2 - idem*/
-
 /* 2->3 - faible courant*/
-
 /* 3->4 - fort courant*/
-
 /* 4->5 - non fffdéfini*/
-
 /* 5->6 - non défini*/
-
 /* 6->7 - non défini*/
-
 /* 7->8 - non défini*/
-
 /*fin_nom_reglage*/
 
@@ -600,1385 +328,678 @@
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 reglage_bolo  reglage_standard[8]={{
 
 
-
-
-
 /*debut reglage 0 */
-
 #ifdef programme
-
 {32,76,8,1},{
-
 {20,0}
-
 ,{1311522837,256000}
-
 ,{1048576021,256004}
-
-,{20,0}
-
+,{20,0}
 ,{1048576021,256001}
-
-,{20,0}
-
+,{20,0}
 ,{262144021,128003}
-
-,{20,0}
-
-,{262144021,128001}
-
-,{262144021,128001}
-
-,{20,0}
-
+,{20,0}
+,{262144021,128001}
+,{262144021,128001}
+,{20,0}
 ,{1048576021,256257}
-
 ,{1048576021,256003}
-
-,{262144021,128001}
-
+,{262144021,128001}
 ,{262144789,128001}
-
-,{262144021,128001}
-
+,{262144021,128001}
 ,{100663317,256002}
-
 ,{100716053,155650}
-
 ,{1048576277,256003}
-
-,{20,0}
-
+,{20,0}
 ,{1024021,0}
-
 ,{262165,0}
-
-,{65557,0}
-
+,{65557,0}
 ,{1024020,0}
-
-},{
-
+},{
 {1,21,16,4}
-
 ,{1,21,13,4}
-
 ,{1,21,20,4}
-
 ,{1,21,20,4}
-
 ,{0,21,0,4}
-
 ,{0,21,0,4}
-
-},{
-
+},{
 {3,1,21,24,21,24,0}
-
-,{0,1,9,1,0,0,0}
-
-,{0,1,9,1,0,0,0}
-
+,{0,1,9,1,0,0,0}
+,{0,1,9,1,0,0,0}
 ,{6,1,9,34,30,0,65326}
-
 },{5,3,129,108,0,126,104,88} 
-
 #else
-
 {1,8,76,32},{
-
 {20,0}
-
 ,{1311522837,256000}
-
 ,{1048576021,256004}
-
-,{20,0}
-
+,{20,0}
 ,{1048576021,256001}
-
-,{20,0}
-
+,{20,0}
 ,{262144021,128003}
-
-,{20,0}
-
-,{262144021,128001}
-
-,{262144021,128001}
-
-,{20,0}
-
+,{20,0}
+,{262144021,128001}
+,{262144021,128001}
+,{20,0}
 ,{1048576021,256257}
-
 ,{1048576021,256003}
-
-,{262144021,128001}
-
+,{262144021,128001}
 ,{262144789,128001}
-
-,{262144021,128001}
-
+,{262144021,128001}
 ,{100663317,256002}
-
 ,{100716053,155650}
-
 ,{1048576277,256003}
-
-,{20,0}
-
+,{20,0}
 ,{1024021,0}
-
 ,{262165,0}
-
-,{65557,0}
-
+,{65557,0}
 ,{1024020,0}
-
-},{
-
+},{
 {4,16,21,1}
-
 ,{4,13,21,1}
-
 ,{4,20,21,1}
-
 ,{4,20,21,1}
-
 ,{4,0,21,0}
-
 ,{4,0,21,0}
-
-},{
-
+},{
 {24,21,1,3,0,24,21}
-
-,{1,9,1,0,0,0,0}
-
-,{1,9,1,0,0,0,0}
-
+,{1,9,1,0,0,0,0}
+,{1,9,1,0,0,0,0}
 ,{34,9,1,6,65326,0,30}
-
 },{108,129,3,5,88,104,126,0} 
-
 #endif
-
 /*fin_reglage*/
 
 
-
-
-
-},{
-
-
+},{
 
 /*debut reglage 1 */
-
 #ifdef programme
-
 {32,76,8,1},{
-
 {20,0}
-
 ,{1311522837,256000}
-
 ,{1048576021,256004}
-
-,{20,0}
-
+,{20,0}
 ,{1048576021,256001}
-
-,{20,0}
-
+,{20,0}
 ,{262144021,128003}
-
-,{20,0}
-
-,{262144021,128001}
-
-,{262144021,128001}
-
-,{20,0}
-
+,{20,0}
+,{262144021,128001}
+,{262144021,128001}
+,{20,0}
 ,{1048576021,256257}
-
 ,{1048576021,256003}
-
-,{262144021,128001}
-
+,{262144021,128001}
 ,{262144789,128001}
-
-,{262144021,128001}
-
+,{262144021,128001}
 ,{100663317,256002}
-
 ,{100716053,155650}
-
 ,{1048576277,256003}
-
-,{20,0}
-
+,{20,0}
 ,{1024021,0}
-
 ,{262165,0}
-
-,{65557,0}
-
+,{65557,0}
 ,{1024020,0}
-
-},{
-
+},{
 {1,21,16,4}
-
 ,{1,21,13,4}
-
 ,{1,21,20,4}
-
 ,{1,21,20,4}
-
 ,{0,21,0,4}
-
 ,{0,21,0,4}
-
-},{
-
+},{
 {3,1,21,24,21,24,0}
-
-,{0,1,9,1,0,0,0}
-
-,{0,1,9,1,0,0,0}
-
+,{0,1,9,1,0,0,0}
+,{0,1,9,1,0,0,0}
 ,{6,1,9,34,30,0,65326}
-
 },{5,3,129,108,0,126,104,88} 
-
 #else
-
 {1,8,76,32},{
-
 {20,0}
-
 ,{1311522837,256000}
-
 ,{1048576021,256004}
-
-,{20,0}
-
+,{20,0}
 ,{1048576021,256001}
-
-,{20,0}
-
+,{20,0}
 ,{262144021,128003}
-
-,{20,0}
-
-,{262144021,128001}
-
-,{262144021,128001}
-
-,{20,0}
-
+,{20,0}
+,{262144021,128001}
+,{262144021,128001}
+,{20,0}
 ,{1048576021,256257}
-
 ,{1048576021,256003}
-
-,{262144021,128001}
-
+,{262144021,128001}
 ,{262144789,128001}
-
-,{262144021,128001}
-
+,{262144021,128001}
 ,{100663317,256002}
-
 ,{100716053,155650}
-
 ,{1048576277,256003}
-
-,{20,0}
-
+,{20,0}
 ,{1024021,0}
-
 ,{262165,0}
-
-,{65557,0}
-
+,{65557,0}
 ,{1024020,0}
-
-},{
-
+},{
 {4,16,21,1}
-
 ,{4,13,21,1}
-
 ,{4,20,21,1}
-
 ,{4,20,21,1}
-
 ,{4,0,21,0}
-
 ,{4,0,21,0}
-
-},{
-
+},{
 {24,21,1,3,0,24,21}
-
-,{1,9,1,0,0,0,0}
-
-,{1,9,1,0,0,0,0}
-
+,{1,9,1,0,0,0,0}
+,{1,9,1,0,0,0,0}
 ,{34,9,1,6,65326,0,30}
-
 },{108,129,3,5,88,104,126,0} 
-
 #endif
-
 /*fin_reglage*/
 
-
-
-},{
-
-
+},{
 
 /*debut reglage 2 */
-
 #ifdef programme
-
 {32,76,8,1},{
-
 {20,0}
-
 ,{100721941,256000}
-
 ,{1048607509,256004}
-
-,{20,0}
-
+,{20,0}
 ,{1048586773,256003}
-
-,{20,0}
-
+,{20,0}
 ,{50335509,128001}
-
-,{20,0}
-
+,{20,0}
 ,{50331669,128001}
-
 ,{50336789,128001}
-
-,{20,0}
-
+,{20,0}
 ,{1048622101,256259}
-
 ,{1048635413,256003}
-
 ,{50331669,128001}
-
 ,{50352661,128001}
-
 ,{50337813,128001}
-
 ,{100665109,256002}
-
 ,{100664597,155650}
-
 ,{1048600341,256003}
-
-,{20,0}
-
+,{20,0}
 ,{1024021,0}
-
-,{65557,0}
-
-,{65557,0}
-
+,{65557,0}
+,{65557,0}
 ,{262165,0}
-
-},{
-
+},{
 {1,21,11,4}
-
 ,{1,21,13,4}
-
 ,{1,21,20,4}
-
 ,{1,21,20,4}
-
 ,{0,20,0,1}
-
 ,{0,20,0,1}
-
-},{
-
+},{
 {3,1,21,24,21,24,0}
-
-,{0,1,9,1,0,0,0}
-
-,{0,1,9,1,0,0,0}
-
+,{0,1,9,1,0,0,0}
+,{0,1,9,1,0,0,0}
 ,{6,17,0,34,30,0,65386}
-
 },{5,3,129,108,0,126,104,88} 
-
 #else
-
 {1,8,76,32},{
-
 {20,0}
-
 ,{100721941,256000}
-
 ,{1048607509,256004}
-
-,{20,0}
-
+,{20,0}
 ,{1048586773,256003}
-
-,{20,0}
-
+,{20,0}
 ,{50335509,128001}
-
-,{20,0}
-
+,{20,0}
 ,{50331669,128001}
-
 ,{50336789,128001}
-
-,{20,0}
-
+,{20,0}
 ,{1048622101,256259}
-
 ,{1048635413,256003}
-
 ,{50331669,128001}
-
 ,{50352661,128001}
-
 ,{50337813,128001}
-
 ,{100665109,256002}
-
 ,{100664597,155650}
-
 ,{1048600341,256003}
-
-,{20,0}
-
+,{20,0}
 ,{1024021,0}
-
-,{65557,0}
-
-,{65557,0}
-
+,{65557,0}
+,{65557,0}
 ,{262165,0}
-
-},{
-
+},{
 {4,11,21,1}
-
 ,{4,13,21,1}
-
 ,{4,20,21,1}
-
 ,{4,20,21,1}
-
 ,{1,0,20,0}
-
 ,{1,0,20,0}
-
-},{
-
+},{
 {24,21,1,3,0,24,21}
-
-,{1,9,1,0,0,0,0}
-
-,{1,9,1,0,0,0,0}
-
+,{1,9,1,0,0,0,0}
+,{1,9,1,0,0,0,0}
 ,{34,0,17,6,65386,0,30}
-
 },{108,129,3,5,88,104,126,0} 
-
 #endif
-
 /*fin_reglage*/
 
-
-
-},{
-
-
+},{
 
 /*debut reglage 3 */
-
 #ifdef programme
-
 {32,76,8,1},{
-
 {20,0}
-
 ,{100721941,256000}
-
 ,{1048607509,256004}
-
-,{20,0}
-
+,{20,0}
 ,{1048586773,256003}
-
-,{20,0}
-
+,{20,0}
 ,{524291861,128001}
-
-,{20,0}
-
+,{20,0}
 ,{524288021,128001}
-
 ,{524293141,128001}
-
-,{20,0}
-
+,{20,0}
 ,{1048622101,256259}
-
 ,{1048635413,256003}
-
 ,{524288021,128001}
-
 ,{524309013,128001}
-
 ,{524294165,128001}
-
 ,{100665109,256002}
-
 ,{100664597,155650}
-
 ,{1048600341,256003}
-
-,{20,0}
-
+,{20,0}
 ,{1024021,0}
-
-,{65557,0}
-
-,{65557,0}
-
-,{65557,0}
-
-},{
-
+,{65557,0}
+,{65557,0}
+,{65557,0}
+},{
 {1,21,18,4}
-
 ,{1,21,13,4}
-
 ,{1,21,20,4}
-
 ,{1,21,20,4}
-
 ,{0,20,0,1}
-
 ,{0,20,0,1}
-
-},{
-
+},{
 {3,1,21,24,21,24,0}
-
-,{0,1,9,1,0,0,0}
-
-,{0,1,9,1,0,0,0}
-
+,{0,1,9,1,0,0,0}
+,{0,1,9,1,0,0,0}
 ,{6,17,0,34,30,0,65386}
-
 },{5,3,129,108,0,126,104,88} 
-
 #else
-
 {1,8,76,32},{
-
 {20,0}
-
 ,{100721941,256000}
-
 ,{1048607509,256004}
-
-,{20,0}
-
+,{20,0}
 ,{1048586773,256003}
-
-,{20,0}
-
+,{20,0}
 ,{524291861,128001}
-
-,{20,0}
-
+,{20,0}
 ,{524288021,128001}
-
 ,{524293141,128001}
-
-,{20,0}
-
+,{20,0}
 ,{1048622101,256259}
-
 ,{1048635413,256003}
-
 ,{524288021,128001}
-
 ,{524309013,128001}
-
 ,{524294165,128001}
-
 ,{100665109,256002}
-
 ,{100664597,155650}
-
 ,{1048600341,256003}
-
-,{20,0}
-
+,{20,0}
 ,{1024021,0}
-
-,{65557,0}
-
-,{65557,0}
-
-,{65557,0}
-
-},{
-
+,{65557,0}
+,{65557,0}
+,{65557,0}
+},{
 {4,18,21,1}
-
 ,{4,13,21,1}
-
 ,{4,20,21,1}
-
 ,{4,20,21,1}
-
 ,{1,0,20,0}
-
 ,{1,0,20,0}
-
-},{
-
+},{
 {24,21,1,3,0,24,21}
-
-,{1,9,1,0,0,0,0}
-
-,{1,9,1,0,0,0,0}
-
+,{1,9,1,0,0,0,0}
+,{1,9,1,0,0,0,0}
 ,{34,0,17,6,65386,0,30}
-
 },{108,129,3,5,88,104,126,0} 
-
 #endif
-
 /*fin_reglage*/
 
-
-
-},{
-
-
+},{
 
 /*debut reglage 4 */
-
 #ifdef programme
-
 {39,62,9,1},{
-
 {20,0}
-
 ,{-100659180,229382}
-
 ,{-100659436,294918}
-
-,{20,0}
-
+,{20,0}
 ,{-100663276,221189}
-
 ,{-100663276,5}
-
 ,{-100659436,245762}
-
 ,{-100663276,5}
-
 ,{-100658154,245761}
-
 ,{-100658156,253954}
-
-,{20,0}
-
+,{20,0}
 ,{-100663276,204805}
-
 ,{-100663276,16389}
-
 ,{-100656874,1}
-
 ,{-100656874,16385}
-
 ,{-100663276,3}
-
 ,{-100506347,6}
-
 ,{-100509675,6}
-
 ,{-100372972,6}
-
 ,{2097174,0}
-
 ,{1024022,0}
-
 ,{16406,0}
-
 ,{4117,0}
-
 ,{262164,0}
-
-},{
-
+},{
 {2,22,24,1}
-
 ,{1,20,24,4}
-
 ,{0,20,24,4}
-
 ,{0,20,24,3}
-
 ,{0,20,24,4}
-
 ,{0,20,24,4}
-
-},{
-
+},{
 {0,1,9,1,0,0,0}
-
-,{0,1,9,1,0,0,0}
-
-,{0,1,9,1,0,0,0}
-
-,{0,1,9,1,0,0,0}
-
+,{0,1,9,1,0,0,0}
+,{0,1,9,1,0,0,0}
+,{0,1,9,1,0,0,0}
 },{2,3,129,108,2,126,104,88} 
-
 #else
-
 {1,9,62,39},{
-
 {20,0}
-
 ,{-100659180,229382}
-
 ,{-100659436,294918}
-
-,{20,0}
-
+,{20,0}
 ,{-100663276,221189}
-
 ,{-100663276,5}
-
 ,{-100659436,245762}
-
 ,{-100663276,5}
-
 ,{-100658154,245761}
-
 ,{-100658156,253954}
-
-,{20,0}
-
+,{20,0}
 ,{-100663276,204805}
-
 ,{-100663276,16389}
-
 ,{-100656874,1}
-
 ,{-100656874,16385}
-
 ,{-100663276,3}
-
 ,{-100506347,6}
-
 ,{-100509675,6}
-
 ,{-100372972,6}
-
 ,{2097174,0}
-
 ,{1024022,0}
-
 ,{16406,0}
-
 ,{4117,0}
-
 ,{262164,0}
-
-},{
-
+},{
 {1,24,22,2}
-
 ,{4,24,20,1}
-
 ,{4,24,20,0}
-
 ,{3,24,20,0}
-
 ,{4,24,20,0}
-
 ,{4,24,20,0}
-
-},{
-
+},{
 {1,9,1,0,0,0,0}
-
-,{1,9,1,0,0,0,0}
-
-,{1,9,1,0,0,0,0}
-
-,{1,9,1,0,0,0,0}
-
+,{1,9,1,0,0,0,0}
+,{1,9,1,0,0,0,0}
+,{1,9,1,0,0,0,0}
 },{108,129,3,2,88,104,126,2} 
-
 #endif
-
 /*fin_reglage*/
 
-
-
-},{
-
-
+},{
 
 /*debut reglage 5 */
-
 #ifdef programme
-
 {39,68,9,1},{
-
 {20,0}
-
 ,{1048982293,229382}
-
 ,{1049128469,253958}
-
-,{20,0}
-
+,{20,0}
 ,{1048966677,245765}
-
-,{20,0}
-
+,{20,0}
 ,{262157846,245762}
-
 ,{1048919829,5}
-
 ,{262156054,245761}
-
 ,{262154006,253954}
-
-,{20,0}
-
+,{20,0}
 ,{1049123349,229381}
-
 ,{1049157141,237573}
-
 ,{262154262,1}
-
 ,{262158614,16385}
-
 ,{262149654,3}
-
 ,{262750740,237572}
-
 ,{262606612,122884}
-
 ,{-1174095083,139270}
-
-,{20,0}
-
+,{20,0}
 ,{16406,0}
-
 ,{16406,0}
-
 ,{4117,0}
-
 ,{262164,0}
-
-},{
-
+},{
 {1,22,16,1}
-
 ,{1,22,16,4}
-
 ,{1,22,16,4}
-
 ,{1,20,16,3}
-
 ,{1,21,20,4}
-
 ,{1,21,20,4}
-
-},{
-
+},{
 {0,1,9,1,0,0,0}
-
-,{0,1,9,1,0,0,0}
-
-,{0,1,9,1,0,0,0}
-
-,{0,1,9,1,0,0,0}
-
+,{0,1,9,1,0,0,0}
+,{0,1,9,1,0,0,0}
+,{0,1,9,1,0,0,0}
 },{2,3,129,108,3,126,104,88} 
-
 #else
-
 {1,9,68,39},{
-
 {20,0}
-
 ,{1048982293,229382}
-
 ,{1049128469,253958}
-
-,{20,0}
-
+,{20,0}
 ,{1048966677,245765}
-
-,{20,0}
-
+,{20,0}
 ,{262157846,245762}
-
 ,{1048919829,5}
-
 ,{262156054,245761}
-
 ,{262154006,253954}
-
-,{20,0}
-
+,{20,0}
 ,{1049123349,229381}
-
 ,{1049157141,237573}
-
 ,{262154262,1}
-
 ,{262158614,16385}
-
 ,{262149654,3}
-
 ,{262750740,237572}
-
 ,{262606612,122884}
-
 ,{-1174095083,139270}
-
-,{20,0}
-
+,{20,0}
 ,{16406,0}
-
 ,{16406,0}
-
 ,{4117,0}
-
 ,{262164,0}
-
-},{
-
+},{
 {1,16,22,1}
-
 ,{4,16,22,1}
-
 ,{4,16,22,1}
-
 ,{3,16,20,1}
-
 ,{4,20,21,1}
-
 ,{4,20,21,1}
-
-},{
-
+},{
 {1,9,1,0,0,0,0}
-
-,{1,9,1,0,0,0,0}
-
-,{1,9,1,0,0,0,0}
-
-,{1,9,1,0,0,0,0}
-
+,{1,9,1,0,0,0,0}
+,{1,9,1,0,0,0,0}
+,{1,9,1,0,0,0,0}
 },{108,129,3,2,88,104,126,3} 
-
 #endif
-
 /*fin_reglage*/
 
-
-
-},{
-
-
+},{
 
 /*debut reglage 6 */
-
 #ifdef programme
-
 {197,191,175,185},{
-
 {0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-},{
-
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+},{
 {106,98,93,71}
-
 ,{66,74,87,66}
-
 ,{48,46,38,33}
-
 ,{40,41,33,26}
-
 ,{25,29,40,57}
-
 ,{63,62,71,80}
-
-},{
-
+},{
 {83,79,75,75,92,112,31100}
-
 ,{125,126,117,113,107,94,20315}
-
 ,{108,116,122,124,117,120,32117}
-
 ,{110,99,94,98,107,93,17217}
-
 },{88,82,94,108,111,126,104,88} 
-
 #else
-
 {185,175,191,197},{
-
 {0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-},{
-
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+},{
 {71,93,98,106}
-
 ,{66,87,74,66}
-
 ,{33,38,46,48}
-
 ,{26,33,41,40}
-
 ,{57,40,29,25}
-
 ,{80,71,62,63}
-
-},{
-
+},{
 {75,75,79,83,31100,112,92}
-
 ,{113,117,126,125,20315,94,107}
-
 ,{124,122,116,108,32117,120,117}
-
 ,{98,94,99,110,17217,93,107}
-
 },{108,94,82,88,88,104,126,111} 
-
 #endif
-
 /*fin_reglage*/
 
-
-
-},{
-
-
+},{
 
 /*debut reglage 7 */
-
 #ifdef programme
-
 {197,191,175,185},{
-
 {0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-},{
-
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+},{
 {106,98,93,71}
-
 ,{66,74,87,66}
-
 ,{48,46,38,33}
-
 ,{40,41,33,26}
-
 ,{25,29,40,57}
-
 ,{63,62,71,80}
-
-},{
-
+},{
 {83,79,75,75,92,112,31100}
-
 ,{125,126,117,113,107,94,20315}
-
 ,{108,116,122,124,117,120,32117}
-
 ,{110,99,94,98,107,93,17217}
-
 },{88,82,94,108,111,126,104,88} 
-
 #else
-
 {185,175,191,197},{
-
 {0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-,{0,0}
-
-},{
-
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+},{
 {71,93,98,106}
-
 ,{66,87,74,66}
-
 ,{33,38,46,48}
-
 ,{26,33,41,40}
-
 ,{57,40,29,25}
-
 ,{80,71,62,63}
-
-},{
-
+},{
 {75,75,79,83,31100,112,92}
-
 ,{113,117,126,125,20315,94,107}
-
 ,{124,122,116,108,32117,120,117}
-
 ,{98,94,99,110,17217,93,107}
-
 },{108,94,82,88,88,104,126,111} 
-
 #endif
-
 /*fin_reglage*/
 
-
-
 } };
 
@@ -1986,21 +1007,10 @@
 
 
-
-
-
-
-
 int	calcul_somme_block(block_type_modele* blk,int longueur)
-
 {
-
 int i,so=0;;
-
 for(i=0;i<(longueur/4-4);i++)  so^=(int)blk->mot[i];
-
 /* somme sur tous les mots internes	: on exclus le dbut, les codes et la fin	*/
-
 return((so^(so>>16))&0xffff);
-
 }
 
@@ -2008,199 +1018,99 @@
 
 
-
-
-
-
-
 void  valide_block(block_type_modele* blk,int type,int block_num)
-
 {
-
 int somme,longueur;
-
 def_long_block
-
 longueur=long_block[type];
-
 /*printf("valide block adresse %x  type %d  numblock %d  longueur=%d \n" */
-
 /* 		,(unsigned)blk,type,block_num,longueur);*/
-
 blk->debut		=	debut_block_mesure;
-
 somme=0;blk->code1		=	(((long)longueur)<<16)	|	somme;
-
 blk->code2		=	(((long)block_num) & 0xffffff ) | ( (((long)type)<<24)&0xff000000 );
 
-
-
 blk->mot[longueur/4-4]  =	fin_block_mesure;
 
-
-
 #if defined(_ECC_LIB_H_)
-
 {
-
 int place_ecc;
-
 place_ecc=(longueur-4-ECC_SIZE-SIZE_HEAD-((longueur-4-SIZE_HEAD)/ECC_TOTAL)*ECC_SIZE)/4;
-
 SetEcc( blk, (unsigned char *) &(blk->mot[place_ecc] ) ) ;
-
 }
-
 #endif
 
-
-
 somme=calcul_somme_block(blk,longueur);
-
 blk->code1		=	(((long)longueur)<<16)	|	somme;
-
 /* l'ecc est faux car on a change la somme: mettre la somme a zero avant de tester ecc  */
-
 }
 
-
-
 /* Quand on est sur une machine swappee, on ne cherche pas a verifier */
-
 /* le checksum, puisqu'on a modifie les blocs, sans swapper par exemple */
-
 /* les chars des noms de bolometres et des chaines GPS... */
-
 #ifdef __alpha
-
 #define SWAP
-
 #endif
-
 #if defined(Linux)  || defined(linux)
-
 #define SWAP
-
 #endif
 
 
 
-
-
-
-
 int  verifie_block(block_type_modele* blk)
-
 {
-
 int type,lg,som;
-
 def_long_block
-
 if(blk->debut != debut_block_mesure)					return(block_debut_erreur);
-
 type=type_block(blk);		if( (type<0) ||(type>=nb_type_blocks) )	return(block_type_inconnu);	
-
 lg=longueur_block(blk);		if( lg != long_block[type] )		return(block_longueur_erreur);	
-
 if( blk->mot[(lg/4)-4]  !=	fin_block_mesure)			return(block_fin_erreur);	
-
 #ifndef SWAP
-
 som=calcul_somme_block(blk,lg); if( som!= somme_block(blk))		return(block_somme_erreur);
-
 #endif
-
 return(block_correct);
-
 }
 
 
-
-
-
 int  verifie_block_printf(block_type_modele* blk)
-
 {
-
 int type,lg,som;
-
 def_long_block
-
 def_nom_block
-
 if(blk->debut != debut_block_mesure)
-
 	{
-
 	printf(" erreur dans le code debut de block	 \n");
-
 	return(block_debut_erreur);
-
 	}	
 
-
-
 type=type_block(blk);
-
 if( (type<0) || (type>nb_type_blocks) )	
-
 	{
-
 	printf(" block de type %d  inconnu\n",type);
-
 	return(block_type_inconnu);
-
 	}
 
-
-
 lg=longueur_block(blk);
-
 if( lg!=long_block[type] )	
-
 	{
-
 	printf(" block type %s  erreur de longueur (nominal=%d , dans le block=%d \n"
-
 			,nom_block[type],long_block[type],lg);
-
 	return(block_longueur_erreur);
-
 	}
 
-
-
 som=calcul_somme_block(blk,lg);
-
 if( som!=somme_block(blk) )	
-
 	{
-
 	printf(" block type %s   :  erreur de somme (calculee=%d , dans le block=%d \n"
-
 			,nom_block[type],som,somme_block(blk) );
-
 	return(block_somme_erreur);
-
 	}
-
 	
-
 if(blk->mot[(lg/4)-4]	!= fin_block_mesure)	
-
 	{
-
 	printf(" block type %s  erreur de code fin de block : trouve %x au lieu de %x \n"
-
 			,nom_block[type],(int)blk->mot[(lg/4)-4],fin_block_mesure);
-
 	return(block_fin_erreur);
-
 	}
 
-
-
 return(block_correct);
-
 }
 
@@ -2209,8 +1119,2 @@
 
 
-
-
-
-
-
-
Index: /trunk/Poubelle/archediab.old/archeops.h
===================================================================
--- /trunk/Poubelle/archediab.old/archeops.h	(revision 656)
+++ /trunk/Poubelle/archediab.old/archeops.h	(revision 657)
@@ -297,5 +297,16 @@
 	
 /* code_util des bolos  */
-enum{bolo_hors_service,bolo_normal_transmis,bolo_normal_non_transmis,bolo_thermo_simplifie};
+
+/*	bit 0	->	bolo en service	(fenetre ouverte sur le mac)				*/
+/*	bit 1	->	bolo transmis dans les donnees comprimees:  block_type_bolo_comprime	*/
+/*	bit 2	->	courbe 1 periode transmise dans les 	block_type_une_periode		*/
+/*	bit 3	->	carte modofiées bebo pour	thermometre				*/
+
+#define		bolo_en_service			1
+#define		bolo_transmis_comprime		2
+#define		bolo_transmis_un_per		4
+#define		bolo_thermo_simplifie		8
+
+/*enum{bolo_hors_service,bolo_normal_transmis,bolo_normal_une_per,bolo_normal_non_transmis,bolo_thermo_simplifie};*/
 
 	
@@ -706,5 +717,6 @@
 
 /*  ---------------------   structures N° 12 :  data bolo apres compression sur 7 bit	 ------	*/
-/*  --   longueur variable car nb_max_bolo est remplacé par  parametr.nb_bolo apres calcul   ------ */
+/*  -------------------------------------------------------------------------------------------	*/
+/*  --   longueur variable car nb_max_bolo est remplacé par  parametr.nb_bolo apres calcul  --- */
 /*  --     ATTENTION   l'ECC  calcule  est donc faux  !!!!!!				 ------ */
 /*  -------------------------------------------------------------------------------------------	*/
