Changeset 1629 in Sophya for trunk/ArchTOIPipe/TestPipes

Timestamp:

Aug 8, 2001, 12:01:41 PM (24 years ago)

Author:

ansari

Message:

• Ajout pthread_exit apres l'execution de run() ds TOIProcessor::ThreadStart()
• Ajout de la classe ProcSampleCounter<T> pour affichage continu de stats ds toimanager.h .cc
• correction mineure de toi2map.cc
• Utilisation de ProcSampleCounter<T> ds tsttoi2map.cc et simtst.cc

Reza 8/8/2001

Location:

trunk/ArchTOIPipe/TestPipes

Files:

• simtst.cc (modified) (3 diffs)
• tsttoi2map.cc (modified) (3 diffs)

trunk/ArchTOIPipe/TestPipes/simtst.cc

@@ -87 +87 @@
   int istart = 0;
   int iend = 0;
-  int_8 dns_print = 1000;
-  int dns_print_fac = 50;
-  int nbmax_dns_print = 2;
 
   double range_min = -16000;
@@ -207 +204 @@
     //  mgr->setRequestedSample(11680920,11710584);
     //  mgr->setRequestedSample(104121000, 104946120);
-    if (fgsetstart) {
+    if (fgsetstart) 
       mgr->setRequestedSample(istart, iend);
-      dns_print = (iend-istart)/dns_print_fac;
-      if (dns_print < 1000) dns_print = 1000;
-      nbmax_dns_print = (iend-istart)/dns_print;
-    }
+
     //    FITSTOIReader r("/data/Archeops/bolo11.fits); 
     FITSTOIReader r(infile); 
@@ -397 +391 @@
 
     // ------------------- Impression continu de stat ------------------------ 
-    int_8 nb_dns_print = 0;
-    int nb_sleep = 0;
-    int_8 last_sample_count = 0;
-    int_8 processed_samples = 0;
-    int_8 total_sample_count = dns_print*nbmax_dns_print;
-    bool alldone = false;
-    while (!alldone) {
-      processed_samples = filt.ProcessedSampleCount();
-      if ( (processed_samples-last_sample_count > dns_print) || 
-           (processed_samples > total_sample_count-10) ) {
-        last_sample_count = processed_samples;
-        if (nb_dns_print == 0) cout << "\n";
-        nb_dns_print++;
-        cout << ">>> simtst/Info: ProcessedSampleCount()= " << last_sample_count 
-             << " Frac done = " << processed_samples*100/total_sample_count << " %" << endl;
-        if (last_sample_count > total_sample_count-10)  alldone = true;
-        nb_sleep = 0;
-      }
-      else if ((nb_sleep+1)%5 == 0) 
-        cout << "> simtst/Info: ProcSamples()= " <<  processed_samples 
-             << " Done = " << " %" << processed_samples*100/total_sample_count
-             << " NbSleep(1) = " << nb_sleep << endl;
-        
-      sleep(1);  nb_sleep++;
-    }
-
+    ProcSampleCounter<SimpleFilter> stats(filt);
+    stats.InfoMessage() = "simtst/Info";
+    stats.PrintStats();
     // -----------------------------------------------------------------------
 

trunk/ArchTOIPipe/TestPipes/tsttoi2map.cc

@@ -154 +154 @@
 //--------------------------------------------------------------------
 
+
  // FITS reader
  FITSTOIReader rfitsb(fitsin_bolo);
@@ -222 +223 @@
    }
 
+ //  Affichage de l'avancement des TOIProcessors 
+ ProcSampleCounter<FITSTOIReader>  stats(rfitsb);
+ stats.InfoMessage() = "tsttoi2map/Info";
+ stats.PrintStats();
+
+ // Fin des traitements des TOIProcessors  
  mgr->joinAll();
  PrtTim("End threads");
+
 
  // Ecriture de la sphere Healpix sur fits
@@ -240 +248 @@
 
  // Nettoyage
+ cout << "tsttoi2map: cleanup " << endl;
  delete sph;
  if(wsph) delete wsph;
+ cout << "tsttoi2map: ----------- End of job -------------- " << endl;
 
 //--------------------------------------------------------------------