Index: trunk/Poubelle/archediab.old/archeops.c
===================================================================
--- trunk/Poubelle/archediab.old/archeops.c	(revision 637)
+++ trunk/Poubelle/archediab.old/archeops.c	(revision 639)
@@ -1,4 +1,5 @@
 #include "manip.h"
 #include "archeops.h"
+
 
 
@@ -32,10 +33,10 @@
 
 
-/*  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
+/*  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			*/
 
 
@@ -43,34 +44,34 @@
 /*----------------------------------  fenetre :  -----------------------------------*/
 
-param_bolo  parametr={24,24,36,88,18,
-
-{
-{ "v1-bedif1"  , 1,10,1 ,  200, 22000,  200, { 5000   , 123100 , 334200 } },		
-{ "v1-bedif2"  , 1,10,2 ,  200, 22000,  200, { 5000    , 12.31 , 33.42 		} },
-{ "v1-bedif3"  , 1,10,3 ,  200, 22000,  200, { 5000    , 50.0 , 14.0 		} },
-{ "v1-bedif4"  , 1,10,4 ,  200, 22000,  200,  { 5000    , 12.31 , 33.42 	} },
-{ "v1-bedif5"  , 1,10,5 , 1000, 4700, 1000,  { 5000      , 12.31 , 33.42 	} },
-{ "v1-bedif6"  , 1,10,6 , 1000, 4700, 1000,  { 5000      , 12.31 , 33.42 	} },
-
-{ "v1-bedif7"  , 1,10,9 , 1000, 4700, 1000,  { 5000      , 12.31 , 33.42 		 } },
-{ "v1-bedif8"  , 1,10,10, 1000, 4700, 1000,  { 5000      , 12.31 , 33.42 		 } },
-{ "v1-bedif9"  , 1,10,11, 1000, 4700, 1000,  { 5000      , 12.31 , 33.42 		 } },
-{ "v1-bedif10" , 1,10,12, 1000, 4700, 1000,  { 5000     , 12.31 , 33.42 		 } },
-{ "v1-bedif11" , 1,10,13, 1000, 4700, 1000, { 5000     , 12.31 , 33.42 		 } },
-{ "v1-bedif12" , 1,10,14, 1000, 4700, 1000,  { 5000      , 12.31 , 33.42 		 } },
-
-{ "v1-bedif13" , 1,10,17, 1000, 4700, 1000,  { 5000      , 12.31 , 33.42 		 } },
-{ "v1-bedif14" , 1,10,18, 1000, 4700, 1000,  { 5000     , 12.31 , 33.42 		 } },
-{ "germanium"  , 3,10,19, 1000, 22000 ,    0,  { 5000      , 12.31 , 33.42 		 } },
-{ "therm_4k"   , 3,10,20, 1000, 1000  ,    0,  { 5000      , 12.31 , 33.42 		 } },
-{ "therm_1.6k" , 3,10,21, 1000, 1000  ,    0,  { 5000      , 12.31 , 33.42 		 } },
-{ "therm_10k"  , 3,10,22, 1000, 1000  ,    0,  { 5000     , 12.31 , 33.42 		 } },
-
-{ "v1-bedif19"  , 2,10,25 , 1000, 4700, 1000,  { 5000      , 12.31 , 33.42 		 } },
-{ "v1-bedif20"  , 2,10,26, 1000, 4700, 1000,  { 5000      , 12.31 , 33.42 		 } },
-{ "v1-bedif21"  , 2,10,27, 1000, 4700, 1000,  { 5000      , 12.31 , 33.42 		 } },
-{ "v1-bedif22"  , 2,10,28, 1000, 4700, 1000,  { 5000     , 12.31 , 33.42 		 } },
-{ "v1-bedif23"  , 2,10,29, 1000, 4700, 1000,  { 5000     , 12.31 , 33.42 		 } },
-{ "v1-bedif24"  , 2,10,30, 1000, 4700, 1000,  { 5000      , 12.31 , 33.42 		 } }
+param_bolo  parametr={25,24,36,88,18,
+
+{ 
+{ "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} },
 
 }
@@ -115,9 +116,9 @@
 
 /*debut_nom_reglage*/
-/* 0->aa*/
-/* 1->bb*/
+/* 0->a chaud complet*/
+/* 1->a froid pour V(I)*/
 /* 2->cc*/
-/* 3->reglage 3  */
-/* 4->reglage 4  */
+/* 3->a chaud complet*/
+/* 4->chaud avec synchro*/
 /* 5->reglage 5  */
 /* 6->reglage 6  */
@@ -131,55 +132,107 @@
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 reglage_bolo  reglage_standard[8]={{
 
 
 /*debut reglage 0 */
+#ifdef programme
 {30,76,9,1},
 {0
 ,10
 ,1
-,3
-,10
-,2
-,0
-,0
-,1
-,0
-,0
-,0
-,0
-,0
-,0
-,0
-,0
-,0
-,0
-,0
-},{
-{22,100663296}
-,{-100646890,1}
-,{-100646890,1}
-,{22,0}
-,{-100638698,1}
-,{22,253952}
-,{-100646890,1}
-,{22,0}
-,{-100646890,1}
-,{-100646890,1}
-,{22,0}
-,{235388950,221185}
-,{20,0}
-,{20,0}
-,{16406,0}
-,{24598,0}
-,{22,0}
-,{24598,0}
-},{
-{1,22,0,1}
-,{0,20,0,1}
-,{0,20,0,1}
-,{0,20,0,1}
-,{0,20,0,1}
-,{0,20,0,1}
+,1
+,10
+,1
+,1
+,0
+,0
+,0
+,0
+,0
+,1
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+},{
+{20,0}
+,{-1148225771,229380}
+,{-1148367339,294916}
+,{20,0}
+,{21,221185}
+,{21,0}
+,{21,245761}
+,{20,0}
+,{21,245761}
+,{277,253953}
+,{20,0}
+,{21,204801}
+,{21,19457}
+,{21,1}
+,{11501589,8708}
+,{20,0}
+,{-100647916,0}
+,{1015828,0}
+,{20,0}
+,{20,0}
+,{1024022,0}
+,{25622,0}
+,{-100395499,0}
+,{25622,0}
+},{
+{0,0,128,1}
+,{0,0,128,4}
+,{0,0,128,4}
+,{0,0,128,3}
+,{0,0,128,4}
+,{0,0,128,4}
 },{
 {0,1,9,1,0,0,0}
@@ -187,5 +240,66 @@
 ,{0,1,9,1,0,0,0}
 ,{0,1,9,1,0,0,0}
-},{0,0,0,0,0,0,0,0} 
+},{1,3,129,108,3,126,104,88} 
+#else
+{1,9,76,30},
+{1
+,1
+,10
+,0
+,0
+,1
+,1
+,10
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,1
+,0
+,0
+,0
+,0
+},{
+{20,0}
+,{-1148225771,229380}
+,{-1148367339,294916}
+,{20,0}
+,{21,221185}
+,{21,0}
+,{21,245761}
+,{20,0}
+,{21,245761}
+,{277,253953}
+,{20,0}
+,{21,204801}
+,{21,19457}
+,{21,1}
+,{11501589,8708}
+,{20,0}
+,{-100647916,0}
+,{1015828,0}
+,{20,0}
+,{20,0}
+,{1024022,0}
+,{25622,0}
+,{-100395499,0}
+,{25622,0}
+},{
+{1,128,0,0}
+,{4,128,0,0}
+,{4,128,0,0}
+,{3,128,0,0}
+,{4,128,0,0}
+,{4,128,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,1,88,104,126,3} 
+#endif
 /*fin_reglage*/
 
@@ -193,51 +307,58 @@
 
 /*debut reglage 1 */
-{30,76,9,1},
+#ifdef programme
+{31,76,9,1},
 {0
 ,10
 ,1
-,3
-,10
-,2
-,0
-,0
-,1
-,0
-,0
-,0
-,0
-,0
-,0
-,0
-,0
-,0
-,0
-,0
-},{
-{22,100663296}
-,{-100646890,1}
-,{-100646890,1}
-,{22,0}
-,{-100638698,1}
-,{22,253952}
-,{-100646890,1}
-,{22,0}
-,{-100646890,1}
-,{-100646890,1}
-,{22,0}
-,{235388950,221185}
-,{20,0}
-,{20,0}
-,{16406,0}
-,{24598,0}
-,{22,0}
-,{24598,0}
-},{
-{1,22,0,1}
-,{0,20,0,1}
-,{0,20,0,1}
-,{0,20,0,1}
-,{0,20,0,1}
-,{0,20,0,1}
+,1
+,10
+,1
+,0
+,0
+,1
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+},{
+{20,0}
+,{-1148225771,229380}
+,{-1148367339,294916}
+,{20,0}
+,{2127959573,221185}
+,{21,0}
+,{2127892757,245761}
+,{20,0}
+,{2127991317,245761}
+,{2127996181,253953}
+,{20,0}
+,{2128584725,204801}
+,{2127780885,19457}
+,{2127795221,1}
+,{11501589,8708}
+,{20,0}
+,{-100647916,0}
+,{1015828,0}
+,{20,0}
+,{20,0}
+,{12822,0}
+,{25622,0}
+,{-100660714,0}
+,{25622,0}
+},{
+{2,21,25,1}
+,{0,20,0,4}
+,{0,20,0,4}
+,{0,21,23,3}
+,{0,20,0,4}
+,{0,20,0,4}
 },{
 {0,1,9,1,0,0,0}
@@ -245,5 +366,66 @@
 ,{0,1,9,1,0,0,0}
 ,{0,1,9,1,0,0,0}
-},{0,0,0,0,0,0,0,0} 
+},{129,3,129,108,3,126,104,88} 
+#else
+{1,9,76,31},
+{1
+,1
+,10
+,0
+,0
+,0
+,1
+,10
+,0
+,0
+,0
+,1
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+},{
+{20,0}
+,{-1148225771,229380}
+,{-1148367339,294916}
+,{20,0}
+,{2127959573,221185}
+,{21,0}
+,{2127892757,245761}
+,{20,0}
+,{2127991317,245761}
+,{2127996181,253953}
+,{20,0}
+,{2128584725,204801}
+,{2127780885,19457}
+,{2127795221,1}
+,{11501589,8708}
+,{20,0}
+,{-100647916,0}
+,{1015828,0}
+,{20,0}
+,{20,0}
+,{12822,0}
+,{25622,0}
+,{-100660714,0}
+,{25622,0}
+},{
+{1,25,21,2}
+,{4,0,20,0}
+,{4,0,20,0}
+,{3,23,21,0}
+,{4,0,20,0}
+,{4,0,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}
+},{108,129,3,129,88,104,126,3} 
+#endif
 /*fin_reglage*/
 
@@ -251,63 +433,125 @@
 
 /*debut reglage 2 */
-{31,76,9,0},
+#ifdef programme
+{197,191,175,185},
 {0
-,-14
-,-31
-,-63
-,-83
-,-103
-,-122
-,127
-,1
-,97
-,14
-,-32
-,-93
-,-87
-,-72
-,-80
-,-101
-,-112
-,-113
-,-121
-},{
-{22,100663296}
-,{1040629782,204800}
-,{1040834582,221184}
-,{22,0}
-,{-100450282,2}
-,{22,253952}
-,{-100458474,2}
-,{22,0}
-,{-100442090,2}
-,{-100253674,253954}
-,{22,0}
-,{303013910,221184}
-,{20,0}
-,{20,0}
-,{9238,0}
-,{24598,301989888}
-,{22,0}
-,{24598,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-},{
-{-15,-9,-13,-38}
-,{-83,-109,-90,-68}
-,{-99,-101,-67,-61}
-,{-64,-60,-38,-19}
-,{-28,-57,-77,-75}
-,{-66,-55,-51,-68}
-},{
-{31,76,9,0,0,-35,-4643}
-,{-55,-77,-69,-55,-44,-43,-12336}
-,{-56,-85,-128,99,111,-116,-28030}
-,{105,107,101,101,106,111,31615}
-},{-102,-88,-94,-113,-126,101,73,70} 
+,255
+,254
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,83
+,92
+,94
+,98
+,65
+,53
+,53
+,36
+},{
+{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{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
+,254
+,255
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,98
+,94
+,92
+,83
+,36
+,53
+,53
+,65
+},{
+{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{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*/
 
@@ -315,63 +559,125 @@
 
 /*debut reglage 3 */
-{31,76,9,0},
+#ifdef programme
+{30,76,9,1},
 {0
-,-14
-,-31
-,-63
-,-83
-,-103
-,-122
-,127
-,1
-,99
-,13
-,96
-,-93
-,-87
-,-72
-,-80
-,-101
-,-112
-,-113
-,-121
-},{
-{22,100663296}
-,{1040629782,204800}
-,{1040834582,221184}
-,{22,0}
-,{-100450282,2}
-,{22,253952}
-,{-100458474,2}
-,{22,0}
-,{-100442090,2}
-,{-100253674,253954}
-,{22,0}
-,{303013910,221184}
-,{20,0}
-,{20,0}
-,{9238,0}
-,{24598,301989888}
-,{22,0}
-,{24598,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-},{
-{-15,-9,-13,-38}
-,{-83,-109,-90,-68}
-,{-99,-101,-67,-61}
-,{-64,-60,-38,-19}
-,{-28,-57,-77,-75}
-,{-66,-55,-51,-68}
-},{
-{31,76,9,0,0,-35,-4643}
-,{-55,-77,-69,-55,-44,-43,-12336}
-,{-56,-85,-128,99,111,-116,-28030}
-,{105,107,101,101,106,111,31615}
-},{-102,-88,-94,-113,-126,101,73,70} 
+,10
+,1
+,1
+,10
+,1
+,0
+,0
+,0
+,0
+,0
+,0
+,1
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+},{
+{20,0}
+,{-1149239274,229380}
+,{-1149239275,294916}
+,{20,0}
+,{20,221185}
+,{21,0}
+,{20,245761}
+,{20,0}
+,{20,245761}
+,{276,253953}
+,{20,0}
+,{20,204801}
+,{20,19457}
+,{20,1}
+,{10486037,8708}
+,{20,0}
+,{-100647916,0}
+,{1015828,0}
+,{20,0}
+,{20,0}
+,{1024022,0}
+,{25622,0}
+,{-100660714,0}
+,{25622,0}
+},{
+{0,20,0,1}
+,{0,20,0,4}
+,{0,20,0,4}
+,{2,20,0,3}
+,{0,20,0,4}
+,{0,20,0,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}
+},{1,3,129,108,3,126,104,88} 
+#else
+{1,9,76,30},
+{1
+,1
+,10
+,0
+,0
+,0
+,1
+,10
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,1
+,0
+,0
+,0
+,0
+},{
+{20,0}
+,{-1149239274,229380}
+,{-1149239275,294916}
+,{20,0}
+,{20,221185}
+,{21,0}
+,{20,245761}
+,{20,0}
+,{20,245761}
+,{276,253953}
+,{20,0}
+,{20,204801}
+,{20,19457}
+,{20,1}
+,{10486037,8708}
+,{20,0}
+,{-100647916,0}
+,{1015828,0}
+,{20,0}
+,{20,0}
+,{1024022,0}
+,{25622,0}
+,{-100660714,0}
+,{25622,0}
+},{
+{1,0,20,0}
+,{4,0,20,0}
+,{4,0,20,0}
+,{3,0,20,2}
+,{4,0,20,0}
+,{4,0,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}
+},{108,129,3,1,88,104,126,3} 
+#endif
 /*fin_reglage*/
 
@@ -379,63 +685,125 @@
 
 /*debut reglage 4 */
-{31,76,9,0},
+#ifdef programme
+{30,76,9,1},
 {0
-,-14
-,-31
-,-63
-,-83
-,-103
-,-122
-,127
-,1
-,99
-,13
-,112
-,-93
-,-87
-,-72
-,-80
-,-101
-,-112
-,-113
-,-121
-},{
-{22,100663296}
-,{1040629782,204800}
-,{1040834582,221184}
-,{22,0}
-,{-100450282,2}
-,{22,253952}
-,{-100458474,2}
-,{22,0}
-,{-100442090,2}
-,{-100253674,253954}
-,{22,0}
-,{303013910,221184}
-,{20,0}
-,{20,0}
-,{9238,0}
-,{24598,301989888}
-,{22,0}
-,{24598,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-},{
-{-15,-9,-13,-38}
-,{-83,-109,-90,-68}
-,{-99,-101,-67,-61}
-,{-64,-60,-38,-19}
-,{-28,-57,-77,-75}
-,{-66,-55,-51,-68}
-},{
-{31,76,9,0,0,-35,-4643}
-,{-55,-77,-69,-55,-44,-43,-12336}
-,{-56,-85,-128,99,111,-116,-28030}
-,{105,107,101,101,106,111,31615}
-},{-102,-88,-94,-113,-126,101,73,70} 
+,10
+,1
+,1
+,10
+,1
+,1
+,0
+,0
+,0
+,0
+,0
+,1
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+},{
+{20,0}
+,{-1148225771,229380}
+,{-1148367339,294916}
+,{20,0}
+,{21,221185}
+,{21,0}
+,{21,245761}
+,{20,0}
+,{21,245761}
+,{277,253953}
+,{20,0}
+,{21,204801}
+,{21,19457}
+,{21,1}
+,{11501589,8708}
+,{20,0}
+,{-100647916,0}
+,{1015828,0}
+,{20,0}
+,{20,0}
+,{1024022,0}
+,{25622,0}
+,{-100395499,0}
+,{25622,0}
+},{
+{0,0,128,1}
+,{0,0,128,4}
+,{0,0,128,4}
+,{0,0,128,3}
+,{0,0,128,4}
+,{0,0,128,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}
+},{1,3,129,108,3,126,104,88} 
+#else
+{1,9,76,30},
+{1
+,1
+,10
+,0
+,0
+,1
+,1
+,10
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,1
+,0
+,0
+,0
+,0
+},{
+{20,0}
+,{-1148225771,229380}
+,{-1148367339,294916}
+,{20,0}
+,{21,221185}
+,{21,0}
+,{21,245761}
+,{20,0}
+,{21,245761}
+,{277,253953}
+,{20,0}
+,{21,204801}
+,{21,19457}
+,{21,1}
+,{11501589,8708}
+,{20,0}
+,{-100647916,0}
+,{1015828,0}
+,{20,0}
+,{20,0}
+,{1024022,0}
+,{25622,0}
+,{-100395499,0}
+,{25622,0}
+},{
+{1,128,0,0}
+,{4,128,0,0}
+,{4,128,0,0}
+,{3,128,0,0}
+,{4,128,0,0}
+,{4,128,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,1,88,104,126,3} 
+#endif
 /*fin_reglage*/
 
@@ -443,63 +811,125 @@
 
 /*debut reglage 5 */
-{31,76,9,0},
+#ifdef programme
+{197,191,175,185},
 {0
-,-14
-,-31
-,-63
-,-83
-,-103
-,-122
-,127
-,1
-,97
-,14
-,-80
-,-93
-,-87
-,-72
-,-80
-,-101
-,-112
-,-113
-,-121
-},{
-{22,100663296}
-,{1040629782,204800}
-,{1040834582,221184}
-,{22,0}
-,{-100450282,2}
-,{22,253952}
-,{-100458474,2}
-,{22,0}
-,{-100442090,2}
-,{-100253674,253954}
-,{22,0}
-,{303013910,221184}
-,{20,0}
-,{20,0}
-,{9238,0}
-,{24598,301989888}
-,{22,0}
-,{24598,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-,{0,0}
-},{
-{-15,-9,-13,-38}
-,{-83,-109,-90,-68}
-,{-99,-101,-67,-61}
-,{-64,-60,-38,-19}
-,{-28,-57,-77,-75}
-,{-66,-55,-51,-68}
-},{
-{31,76,9,0,0,-35,-4643}
-,{-55,-77,-69,-55,-44,-43,-12336}
-,{-56,-85,-128,99,111,-116,-28030}
-,{105,107,101,101,106,111,31615}
-},{-102,-88,-94,-113,-126,101,73,70} 
+,255
+,254
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,83
+,92
+,94
+,98
+,65
+,53
+,53
+,36
+},{
+{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{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
+,254
+,255
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,98
+,94
+,92
+,83
+,36
+,53
+,53
+,65
+},{
+{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{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*/
 
@@ -507,4 +937,125 @@
 
 /*debut reglage 6 */
+#ifdef programme
+{197,191,175,185},
+{0
+,255
+,254
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,83
+,92
+,94
+,98
+,65
+,53
+,53
+,36
+},{
+{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{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
+,254
+,255
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,98
+,94
+,92
+,83
+,36
+,53
+,53
+,65
+},{
+{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{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*/
 
@@ -512,4 +1063,125 @@
 
 /*debut reglage 7 */
+#ifdef programme
+{197,191,175,185},
+{0
+,255
+,254
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,83
+,92
+,94
+,98
+,65
+,53
+,53
+,36
+},{
+{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{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
+,254
+,255
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,0
+,98
+,94
+,92
+,83
+,36
+,53
+,53
+,65
+},{
+{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{0,0}
+,{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*/
 
@@ -524,5 +1196,8 @@
 {
 unsigned long a,xl;
-a=x-2;	if(x<3)  xl=x;	else	xl=((a&1) + 2)<<(a>>1);
+char aa;
+aa=x-2;
+a=aa;
+if(x<3)  xl=x;	else	xl=((a&1) + 2)<<(a>>1);
 return(xl);
 }
@@ -576,4 +1251,13 @@
 
 
+/* 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
 
 
@@ -586,5 +1270,7 @@
 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);
 }
@@ -639,4 +1325,2 @@
 
 
-
-
