Changeset 416 in Sophya for trunk/Poubelle/archTOI.old/archeopsfile.cc

Timestamp:

Sep 23, 1999, 11:08:43 AM (26 years ago)

Author:

ansari

Message:

nouvelles toi

File:

• trunk/Poubelle/archTOI.old/archeopsfile.cc (modified) (3 diffs)

trunk/Poubelle/archTOI.old/archeopsfile.cc

@@ -886 +886 @@
 }
 
+long ArcheopsFile::getRawBoloCN(int ibolo, int imesure) {    
+  // Si pas bloc comprime -> 0
+  if (lastBoloComp() == NULL) return 0;
+  if (numero_block(lastBoloComp()) != numero_block(lastBolo())) return 0;
+  block_type_reglage* reglage = lastReglage();
+  if (!reglage) return 0;
+
+  int nb_coups= reglage->reglage.horloge.nb_mesures/2 - reglage->reglage.horloge.temp_mort;
+  unsigned int4* data = lastBoloComp()->data_bolo[ibolo];
+  // Les deux premieres valeurs sont codees directement...
+  if (imesure<2) return 0;
+  int iExp = (imesure-2)/4 + 1;
+  int expo = data[iExp] & 0xf;
+  int noise = 1 << expo;
+  return (noise << 1)/nb_coups;
+}
+
+
+
 def_gains 
 
@@ -899 +918 @@
   //return ((1e5*y)/(65536.*gain_ampli(reglage->reglage.bolo[ibolo])));
 }
+
+double ArcheopsFile::getMuVBoloCN(int ibolo, int imesure) { // microvolts, sur valeur unique 
+  double y = getRawBoloCN(ibolo, imesure);
+  block_type_reglage* reglage = lastReglage();
+  block_type_param*   param = lastParam();
+  if (!reglage) return 0;
+  if (!param) return 0;
+  return bol_micro_volt(y,(double)param->param.bolo[ibolo].bolo_gain*gain_ampli(reglage->reglage.bolo[ibolo]));
+}
+
 
 double ArcheopsFile::getMuVBolo2(int ibolo, int imesure) { // microvolts, filtre 
@@ -1001 +1030 @@
   
   // Attention, on ne transmet pas les canaux 0 et 4....
+  if (ichannel == 0 || ichannel == 4) return 0;
   int i = ichannel - 1;
   if (i >= 4) i--;