Changeset 2011 in Sophya

Timestamp:

May 16, 2002, 4:39:08 PM (23 years ago)

Author:

ansari

Message:

correction bug oubli fits_unlock() ds FitsTOIReader - Reza 16/5/2002

File:

• trunk/ArchTOIPipe/Kernel/fitstoirdr.cc (modified) (4 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoirdr.cc,v 1.27 2002-05-13 13:11:32 ansari Exp $
+// $Id: fitstoirdr.cc,v 1.28 2002-05-16 14:39:08 ansari Exp $
 
 #include "fitstoirdr.h"
@@ -252 +252 @@
      if (implicitSN) {
        if (ideb+implicitSNStart > mgr->getRequestedEnd() 
-           || (forcedMaxIn > 0 && ideb+implicitSNStart > forcedMaxIn)) break;
+           || (forcedMaxIn > 0 && ideb+implicitSNStart > forcedMaxIn)) {
+         fits_unlock();  // unlock avant de casser la boucle - Reza 16/05/2002
+         break;
+       }
        if (ifin+implicitSNStart < mgr->getRequestedBegin()
-           || (forcedMinIn > 0 && ifin+implicitSNStart < forcedMinIn)) continue;
+           || (forcedMinIn > 0 && ifin+implicitSNStart < forcedMinIn)) {
+         fits_unlock();  // unlock avant de continuer - Reza 16/05/2002
+         continue;
+       }
        for (long j=0; j<Buff_Sz; j++) {
          samplenum[j] = j+ideb+implicitSNStart;
@@ -269 +275 @@
        if (samplenum[n-1] < mgr->getRequestedBegin()
            || (forcedMinIn > 0 && samplenum[n-1] < forcedMinIn)) {
-         //---- Pas la peine, fait en fin de boucle - Reza 13/05/2002 fits_unlock();
+         fits_unlock();
          continue;
        }
@@ -286 +292 @@
      }
    }
-   fits_unlock();   // unlock en debut de boucle de lecture - Reza 13/05/2002
+   fits_unlock();   // unlock en fin de boucle de lecture - Reza 13/05/2002
 
    long ip = i-ideb; // pointeurs dans les buffers