Changeset 42445 for trunk/tools/eam/rawfix.20230221/src/fix_chip_locations.pl

Timestamp:

Apr 7, 2023, 4:50:38 PM (3 years ago)

Author:

eugene

Message:

rework to use a stage/iteration tracked by the rawfix database

File:

• trunk/tools/eam/rawfix.20230221/src/fix_chip_locations.pl (modified) (11 diffs)

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

@@ -19 +19 @@
 
 my ($fulldate, $dateword, $chiplist, $stage, $topdir) = &parse_cmdopts;
-my ($neb_dbh) = &parse_db_config ("$topdir/nebulous.config");
+my ($neb_dbh, $raw_dbh) = &parse_db_config ("$topdir/nebulous.config");
 
 # read the list of chip_ids:
@@ -68 +68 @@
 }
 
+my $Nchip = 0;
+
 foreach my $chip_id (@chip_ids) {
 
@@ -96 +98 @@
         if ($failchips{$ext_id}) { $haveMD5 = 1; }
 
+        $Nchip ++;
 
         # nothing to be done, or need be done for these:
@@ -143 +146 @@
                 close (OUTFILE);
             }
-            $Ndups++; 
+            if ($goodMD5) { $Ndups++; } else { $Nfail ++; }
             next; 
         }
@@ -160 +163 @@
                 close (OUTFILE);
             }
-            $Nxbck++; 
+            if ($goodMD5) { $Nxbck++; } else { $Nfail ++; }
             next; 
         }
@@ -191 +194 @@
 
             # these are done in stage 3:
-            if ($state eq "CUL1:") { $Ncul1++; next; }
-            if ($state eq "CUL2:") { $Ncul2++; next; }
-            if ($state eq "CUL3:") { $Ncul3++; next; }
+            if ($goodMD5) { 
+                if ($state eq "CUL1:") { $Ncul1++; next; }
+                if ($state eq "CUL2:") { $Ncul2++; next; }
+                if ($state eq "CUL3:") { $Ncul3++; next; }
+            } else { $Nfail ++; }
         }
     }
@@ -199 +204 @@
 }
 
+print "Nchip: $Nchip\n";
 print "Ngood: $Ngood\n";
 print "Ngone: $Ngone\n";
@@ -209 +215 @@
 print "Ncul2: $Ncul2\n";
 print "Ncul3: $Ncul3\n";
+print "Nfail: $Nfail\n";
+
+my $Ntotal = $Ngood + $Ngone + $Ndead + $Nsing + $Ndups + $Nsbck + $Nxbck + $Ncul1 + $Ncul2 + $Ncul3 + $Nfail;
+if ($Ntotal != $Nchip) { die "ERROR: inconsistent count of chips\n"; } 
+
+# update the stats in the database
+my $sql_update_stats = "UPDATE nights set";
+$sql_update_stats .= "  Nchip = $Nchip";
+$sql_update_stats .= ", Ngood = $Ngood";
+$sql_update_stats .= ", Ndead = $Ndead";
+$sql_update_stats .= ", Ngone = $Ngone";
+$sql_update_stats .= ", Nsing = $Nsing";
+$sql_update_stats .= ", Ndups = $Ndups";
+$sql_update_stats .= ", Nsbck = $Nsbck";
+$sql_update_stats .= ", Nxbck = $Nxbck";
+$sql_update_stats .= ", Ncul1 = $Ncul1";
+$sql_update_stats .= ", Ncul2 = $Ncul2";
+$sql_update_stats .= ", Ncul3 = $Ncul3";
+$sql_update_stats .= ", Nfail = $Nfail";
+$sql_update_stats .= " WHERE dateobs = $dateword";
+
+my $query = $raw_dbh->prepare($sql_update_stats);
+$query->execute () or die "invalid response from RAW database\n";
 
 exit 0;
@@ -398 +427 @@
 
     my ( $nebdb_name, $nebdb_host, $nebdb_port, $nebdb_pass, $nebdb_user );
+    my ( $rawdb_name, $rawdb_host, $rawdb_port, $rawdb_pass, $rawdb_user );
 
     if (-e $conffile) {
@@ -409 +439 @@
             if ($_ =~ /NEB_PASS /)  { $nebdb_pass = (split /\s+/,$_)[2]; }
             if ($_ =~ /NEB_PORT /)  { $nebdb_port = (split /\s+/,$_)[2]; }
+
+            if ($_ =~ /RAW_NAME /)  { $rawdb_name = (split /\s+/,$_)[2]; }
+            if ($_ =~ /RAW_HOST /)  { $rawdb_host = (split /\s+/,$_)[2]; }
+            if ($_ =~ /RAW_USER /)  { $rawdb_user = (split /\s+/,$_)[2]; }
+            if ($_ =~ /RAW_PASS /)  { $rawdb_pass = (split /\s+/,$_)[2]; }
+            if ($_ =~ /RAW_PORT /)  { $rawdb_port = (split /\s+/,$_)[2]; }
         }
         close(IN);
         print STDERR  "nebulous config: $nebdb_name $nebdb_host $nebdb_port $nebdb_user $nebdb_pass\n";
+        print STDERR  "raw  dbh config: $rawdb_name $rawdb_host $rawdb_port $rawdb_user $rawdb_pass\n";
     }
 
@@ -420 +457 @@
     pod2usage( -msg => "Cannot configure nebulous database (dbpass)", -exitval => 2) unless defined $nebdb_pass;
 
+    pod2usage( -msg => "Cannot configure raw database (dbname)", -exitval => 2) unless defined $rawdb_name;
+    pod2usage( -msg => "Cannot configure raw database (dbhost)", -exitval => 2) unless defined $rawdb_host;
+    pod2usage( -msg => "Cannot configure raw database (dbuser)", -exitval => 2) unless defined $rawdb_user;
+    pod2usage( -msg => "Cannot configure raw database (dbport)", -exitval => 2) unless defined $rawdb_port;
+    pod2usage( -msg => "Cannot configure raw database (dbpass)", -exitval => 2) unless defined $rawdb_pass;
+
     my $nebdb_dsn = "DBI:mysql:database=$nebdb_name:host=$nebdb_host";
     if ($nebdb_port ne "NONE") { $nebdb_dsn .= ":port=$nebdb_port"; }
     my $neb_dbh = DBI->connect($nebdb_dsn, $nebdb_user, $nebdb_pass, { RaiseError => 1, AutoCommit => 1} ) or die "Unable to connect to database $DBI::errstr\n";
 
-    return ($neb_dbh);
+    my $rawdb_dsn = "DBI:mysql:database=$rawdb_name:host=$rawdb_host";
+    if ($rawdb_port ne "NONE") { $rawdb_dsn .= ":port=$rawdb_port"; }
+    my $raw_dbh = DBI->connect($rawdb_dsn, $rawdb_user, $rawdb_pass, { RaiseError => 1, AutoCommit => 1} ) or die "Unable to connect to database $DBI::errstr\n";
+
+    return ($neb_dbh, $raw_dbh);
 }