Index: trunk/Poubelle/archTOI.old/toiiter.cc
===================================================================
--- trunk/Poubelle/archTOI.old/toiiter.cc	(revision 432)
+++ trunk/Poubelle/archTOI.old/toiiter.cc	(revision 436)
@@ -7,4 +7,5 @@
 extern "C" {
 #include "archeops.h"
+#include "arcunit.h"
 }
 #endif
@@ -303,4 +304,40 @@
         trigMask |= block_gps_mask;
         break;
+      case voyantEVO:
+      case voyantEVF:
+      case commandeEV0:
+      case commandeEVF:
+      case commandeEVB:
+      case commandeEVV:
+      case pressEnt3He:
+      case debit3He:
+      case pressSor3He:
+      case pressEnt4He:
+      case debit4He:
+      case pressSor4He:
+      case pressAirVanne:
+      case pressPompChar:
+      case pressMembrane:
+      case pressExterne:
+      case tensPile10T:
+      case tensPileP18D:
+      case tensPileM18D:
+      case tensPile10B:
+      case tensPileP18B:
+      case tensPileM18B:
+      case tensPileCh:
+      case swPile5:
+      case swPile15:
+      case tempCaissH1:
+      case tempCaissH2:
+      case tempCaissB1:
+      case tempCaissB2:
+      case tempCaissTHe:
+      case tempCaissPiles:
+      case tempCaissDrv:
+      case pressHeBain:
+      case pressPirani:
+        trigMask |= block_dilution_mask;
+        break;
       }
     }
@@ -480,4 +517,5 @@
    case boloRes:
    case boloRawMuVCN:
+   case boloTemp:
      if (imes==0 && file->llastBolo()==NULL) return false;
      return file->lastBolo() != NULL;
@@ -531,7 +569,39 @@
    case deltaSst:
      return false;
-     
-   case boloTemp:
-     return false;
+   case voyantEVO:
+   case voyantEVF:
+   case commandeEV0:
+   case commandeEVF:
+   case commandeEVB:
+   case commandeEVV:
+   case pressEnt3He:
+   case debit3He:
+   case pressSor3He:
+   case pressEnt4He:
+   case debit4He:
+   case pressSor4He:
+   case pressAirVanne:
+   case pressPompChar:
+   case pressMembrane:
+   case pressExterne:
+   case tensPile10T:
+   case tensPileP18D:
+   case tensPileM18D:
+   case tensPile10B:
+   case tensPileP18B:
+   case tensPileM18B:
+   case tensPileCh:
+   case swPile5:
+   case swPile15:
+   case tempCaissH1:
+   case tempCaissH2:
+   case tempCaissB1:
+   case tempCaissB2:
+   case tempCaissTHe:
+   case tempCaissPiles:
+   case tempCaissDrv:
+   case pressHeBain:
+   case pressPirani:
+     return file->lastDilution() != NULL;
    }
    return false;
@@ -573,11 +643,11 @@
      return (getMJD()-archParam.acq.utcOrigin)*24.;
    case boloMuV:
-     return file->getMuVBolo(index, imes);
+     return file->getBoloMuV(index, imes);
    case boloMuV2:
-     return file->getMuVBolo2(index, imes);
+     return file->getBoloMuV2(index, imes);
    case boloRawMuV:
-     return file->getRawBolo(index, imes);
+     return file->getBoloRawMuV(index, imes);
    case boloRawMuVCN:
-     return file->getMuVBoloCN(index, imes);
+     return file->getBoloRawMuVCN(index, imes);
    case boloGainAmpli:
      return file->getGainAmpli(index);
@@ -587,7 +657,9 @@
      return file->getDACI(index);
    case boloMuV2T:
-     return file->getMuVBolo2T(index, imes);
+     return file->getBoloMuV2T(index, imes);
    case boloRes:
      return file->getBoloRes(index, imes);
+   case boloTemp:
+     return file->getBoloTemp(index, imes);
    case dilDAC:
      return file->getADCDil(index);
@@ -659,4 +731,72 @@
         return 0;
      }
+   case voyantEVO:
+        return voyant_EVO(file->lastDilution());
+   case voyantEVF:
+        return voyant_EVF(file->lastDilution());
+   case commandeEV0:
+        return commande_EVO(file->lastDilution());
+   case commandeEVF:
+        return commande_EVF(file->lastDilution());
+   case commandeEVB:
+        return commande_EVB(file->lastDilution());
+   case commandeEVV:
+        return commande_EVV(file->lastDilution());
+   case pressEnt3He:
+        return pression_entree_3He(file->lastDilution());
+   case debit3He:
+        return debit_3He(file->lastDilution());
+   case pressSor3He:
+        return pression_sortie_3He(file->lastDilution());
+   case pressEnt4He:
+        return pression_entree_4He(file->lastDilution());
+   case debit4He:
+        return debit_4He(file->lastDilution());
+   case pressSor4He:
+        return pression_sortie_4He(file->lastDilution());
+   case pressAirVanne:
+        return pression_air_vanne(file->lastDilution());
+   case pressPompChar:
+        return pression_pompe_charbon(file->lastDilution());
+   case pressMembrane:
+        return pression_membranne(file->lastDilution());
+   case pressExterne:
+        return pression_externe(file->lastDilution());
+   case tensPile10T:
+        return tension_pile_10T(file->lastDilution());
+   case tensPileP18D:
+        return tension_pile_p18D(file->lastDilution());
+   case tensPileM18D:
+        return tension_pile_m18D(file->lastDilution());
+   case tensPile10B:
+        return tension_pile_10B(file->lastDilution());
+   case tensPileP18B:
+        return tension_pile_p18B(file->lastDilution());
+   case tensPileM18B:
+        return tension_pile_m18B(file->lastDilution());
+   case tensPileCh:
+        return tension_pile_Ch(file->lastDilution());
+   case swPile5:
+        return switch_pile_5(file->lastDilution());
+   case swPile15:
+        return switch_pile_15(file->lastDilution());
+   case tempCaissH1:
+        return temperature_caisson_haut1(file->lastDilution());
+   case tempCaissH2:
+        return temperature_caisson_haut2(file->lastDilution());
+   case tempCaissB1:
+        return temperature_caisson_bas1(file->lastDilution());
+   case tempCaissB2:
+        return temperature_caisson_bas2(file->lastDilution());
+   case tempCaissTHe:
+        return temperature_caisson_tube_helium(file->lastDilution());
+   case tempCaissPiles:
+        return temperature_caisson_piles(file->lastDilution());
+   case tempCaissDrv:
+        return temperature_caisson_driver_moteur(file->lastDilution());
+   case pressHeBain:
+        return pression_helium_bain(file->lastDilution());
+   case pressPirani:
+        return pression_pirani(file->lastDilution());
    }
    return -1;
@@ -685,4 +825,5 @@
      case boloMuV2T:
      case boloRes:
+     case boloTemp:
        return file->blockNum() == file->getBoloBlockNum();
      case boloRawMuV:
@@ -731,4 +872,39 @@
      case deltaRotAxis:
        return true; // $CHECK$ with SSTHandler
+     case voyantEVO:
+     case voyantEVF:
+     case commandeEV0:
+     case commandeEVF:
+     case commandeEVB:
+     case commandeEVV:
+     case pressEnt3He:
+     case debit3He:
+     case pressSor3He:
+     case pressEnt4He:
+     case debit4He:
+     case pressSor4He:
+     case pressAirVanne:
+     case pressPompChar:
+     case pressMembrane:
+     case pressExterne:
+     case tensPile10T:
+     case tensPileP18D:
+     case tensPileM18D:
+     case tensPile10B:
+     case tensPileP18B:
+     case tensPileM18B:
+     case tensPileCh:
+     case swPile5:
+     case swPile15:
+     case tempCaissH1:
+     case tempCaissH2:
+     case tempCaissB1:
+     case tempCaissB2:
+     case tempCaissTHe:
+     case tempCaissPiles:
+     case tempCaissDrv:
+     case pressHeBain:
+     case pressPirani:
+       return file->blockNum() == file->getDilutionBlockNum() && imes==0;
    }
    return false;
