Changeset 42446 for trunk/tools

Timestamp:

Apr 10, 2023, 11:57:03 AM (3 years ago)

Author:

eugene

Message:

bug fixes, making iterations work

Location:

trunk/tools/eam/rawfix.20230221/src

Files:

• advance.rawfix.pl (added)
• check.rawfix.sh (modified) (2 diffs)
• check_chip_locations.pl (modified) (7 diffs)
• fix_chip_locations.pl (modified) (4 diffs)
• rawfix.advance.pt (modified) (1 diff)
• rawfix.pt (modified) (1 diff)
• update.rawfix.sh (modified) (3 diffs)

trunk/tools/eam/rawfix.20230221/src/check.rawfix.sh

@@ -28 +28 @@
   endif
 
-  mysql $DBOPTS -e "select dateobs, state from nights"
+  mysql $DBOPTS -e "select dateobs, iter, state from nights"
   exit 0
 endif
@@ -49 +49 @@
 
   set mynight = $2
-  mysql $DBOPTS -e "select * from nights where (dateobs = '$mynight')"
+  mysql -E $DBOPTS -e "select * from nights where (dateobs = '$mynight')"
   exit 0
 endif

trunk/tools/eam/rawfix.20230221/src/check_chip_locations.pl

@@ -78 +78 @@
 
         # determine the status of the instances
-        my ($Nmain, $Nback, $Ndead) = &check_instance_xattr ($inforows, $ext_id, $data_st, $md5_sum);
-
-        &check_instance_state ($outfh, $ext_id, $data_st, $md5_sum, $Nmain, $Nback, $Ndead);
+        my ($Nmain, $Nback, $Nlost) = &check_instance_xattr ($inforows, $ext_id, $data_st, $md5_sum);
+
+        &check_instance_state ($outfh, $ext_id, $data_st, $md5_sum, $Nmain, $Nback, $Nlost);
     }
 
@@ -239 +239 @@
     my $Nmain = 0;
     my $Nback = 0;
-    my $Ndead = 0;
+    my $Nlost = 0;
 
     # xattr = 0 means instance @ ITC  (main)
@@ -260 +260 @@
         my $xattr    = $values[3];
         
-        if ($xattr  > 1) { $Ndead ++; next; } # do not save instances on dead partitions
+        if ($xattr  > 1) { $Nlost ++; next; } # do not save instances on dead partitions
         if ($xattr == 0) { $Nmain ++; }
         if ($xattr == 1) { $Nback ++; }
@@ -277 +277 @@
     }
 
-    return ($Nmain, $Nback, $Ndead);
+    return ($Nmain, $Nback, $Nlost);
 }
 
@@ -288 +288 @@
     my $Nmain = $_[4];
     my $Nback = $_[5];
-    my $Ndead = $_[6];
+    my $Nlost = $_[6];
 
     my $outinfo = "$extID $data_st $md5_sum";
@@ -333 +333 @@
 
     # DEAD : no more valid instances
-    if (($Nmain == 0) && ($Nback == 0) && $Ndead) {
+    if (($Nmain == 0) && ($Nback == 0) && $Nlost) {
         print $outfh "DEAD: $outinfo\n";
         $Ndead ++;
@@ -339 +339 @@
     }
     # GONE : no more valid instances
-    if (($Nmain == 0) && ($Nback == 0) && ($Ndead == 0)) {
+    if (($Nmain == 0) && ($Nback == 0) && ($Nlost == 0)) {
         print $outfh "GONE: $outinfo\n";
         $Ngone ++;

trunk/tools/eam/rawfix.20230221/src/fix_chip_locations.pl

@@ -40 +40 @@
 my $Ncul2 = 0;
 my $Ncul3 = 0;
+my $Nfail = 0;
 
 # load the lists of good and fail chips
@@ -146 +147 @@
                 close (OUTFILE);
             }
-            if ($goodMD5) { $Ndups++; } else { $Nfail ++; }
+            ## if we know the MD5 is bad, add to Nfail, otherwise add to Ndups
+            if ($haveMD5 && !$goodMD5) {
+                $Nfail ++; 
+            } else { 
+                $Ndups++; 
+            } 
             next; 
         }
@@ -162 +168 @@
                 print OUTFILE "$newfile $datast $md5sum\n";
                 close (OUTFILE);
-            }
-            if ($goodMD5) { $Nxbck++; } else { $Nfail ++; }
+            } 
+            ## if we know the MD5 is bad, add to Nfail, otherwise add to Nxbck:
+            if ($haveMD5 && !$goodMD5) {
+                $Nfail ++; 
+            } else { 
+                $Nxbck++; 
+            } 
             next; 
         }
@@ -193 +204 @@
             }
 
-            # these are done in stage 3:
-            if ($goodMD5) { 
+            ## if we know the MD5 is bad, add to Nfail, otherwise add to NculX
+            if ($haveMD5 && !$goodMD5) {
+                $Nfail ++; 
+            } else { 
                 if ($state eq "CUL1:") { $Ncul1++; next; }
                 if ($state eq "CUL2:") { $Ncul2++; next; }
                 if ($state eq "CUL3:") { $Ncul3++; next; }
-            } else { $Nfail ++; }
+            } 
         }
     }

trunk/tools/eam/rawfix.20230221/src/rawfix.advance.pt

@@ -17 +17 @@
   task.exec
     # 
-    command advance.rawfix.sh all $MAX_ACTIVE_NIGHTS
+    command advance.rawfix.pl --mode all --topdir $mypath --Nmax $MAX_ACTIVE_NIGHTS
   end
 

trunk/tools/eam/rawfix.20230221/src/rawfix.pt

@@ -23 +23 @@
 # order is this file is not determinative, only the
 # change of state from STAGE1.new -> STAGE1.done -> STAGE2.new
-# input rawfix.advance.pt
+input rawfix.advance.pt
 input rawfix.ckchip.pt
 input rawfix.fixchip.pt

trunk/tools/eam/rawfix.20230221/src/update.rawfix.sh

@@ -2 +2 @@
 
 if ($#argv < 1) then
-  echo "USAGE: update.rawfix.sh (night) (state) [quality]"
+  echo "USAGE: update.rawfix.sh (night) (state) [iter]"
   echo "   EG: update.rawfix.sh 20100501 new"
   exit 2
@@ -9 +9 @@
 set mynight = $1
 set state   = $2
+
+set iter = ""
+if ($#argv == 3) then
+  set iter = ", iter = $3"
+endif
 
 # make the rawfix database to track rawfix operations
@@ -18 +23 @@
 set DBOPTS = "-B --skip-column-names -h $DBHOST -u $DBUSER -p$DBPASS $DBNAME"
 
-mysql $DBOPTS -e "update nights set state = '$state' where (dateobs = '$mynight')"
+mysql $DBOPTS -e "update nights set state = '$state' $iter where (dateobs = '$mynight')"
 exit 0