Changeset 41343 for trunk

Timestamp:

Apr 17, 2020, 12:39:00 PM (6 years ago)

Author:

cclin33

Message:

keep the done/not done status determine by Dexp instead of by number of waprs

File:

• trunk/ippScripts/scripts/night_report.pl (modified) (2 diffs)

trunk/ippScripts/scripts/night_report.pl

@@ -215 +215 @@
 
           if (($uniNvis1 ne $uniNvis2) or ($uniNvis1 ne $uniNvis3) or ($uniNvis1 ne $uniNvis4)) {
-            if ($NWWdiffpub ne $NexpWWdiff2) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk incomplete, not done";}  
-            if ($NWWdiffpub eq $NexpWWdiff2) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk incomplete, done";}
+            if ($NWWdiffpub ne $NexpWWdiff) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk incomplete, not done";}  
+            if ($NWWdiffpub eq $NexpWWdiff) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk incomplete, done";}
           }
           if (($uniNvis1 eq $uniNvis2) and ($uniNvis1 eq $uniNvis3) and ($uniNvis1 eq $uniNvis4)) {
-            if ($NWWdiffpub ne $NexpWWdiff2) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk complete, not done";}
-            if ($NWWdiffpub eq $NexpWWdiff2) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk complete, done";}
+            if ($NWWdiffpub ne $NexpWWdiff) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk complete, not done";}
+            if ($NWWdiffpub eq $NexpWWdiff) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk complete, done";}
           }
     }
@@ -1322 +1322 @@
 
           if (($uniNvis1 ne $uniNvis2) or ($uniNvis1 ne $uniNvis3) or ($uniNvis1 ne $uniNvis4)) {
-            if ($NWWdiffpub ne $NexpWWdiff2) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk incomplete, not done";}  
-            if ($NWWdiffpub eq $NexpWWdiff2) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk incomplete, done";}
+            if ($NWWdiffpub ne $NexpWWdiff) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk incomplete, not done";}  
+            if ($NWWdiffpub eq $NexpWWdiff) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk incomplete, done";}
           }
           if (($uniNvis1 eq $uniNvis2) and ($uniNvis1 eq $uniNvis3) and ($uniNvis1 eq $uniNvis4)) {
-            if ($NWWdiffpub ne $NexpWWdiff2) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk complete, not done";}
-            if ($NWWdiffpub eq $NexpWWdiff2) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk complete, done";}
+            if ($NWWdiffpub ne $NexpWWdiff) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk complete, not done";}
+            if ($NWWdiffpub eq $NexpWWdiff) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%2s | %2s%1s%2s | %4s%1s%4s | %8s | %2s%1s%2s | %8s | %2s%1s%2s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$NexpWWdiff,"/",$NexpWWdiff2,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk complete, done";}
 #          if (($uniNvis1 ne $uniNvis2) or ($uniNvis1 ne $uniNvis3) or ($uniNvis1 ne $uniNvis4)) {
 #            if ($NWWdiffpub ne $NexpWWdiff) {printf "%30s | %2s%1s%2s%1s%2s%1s%2s | %2s%1s%1s | %2s%1s%1s | %8s | %2s%1s%1s | %8s | %2s%1s%1s | %8s | %20s\n", $chunkname, $Nvis1, "/",$Nvis2, "/",$Nvis3, "/",$Nvis4,$Ncamgood, "/",$Ncambad,$Nwarpgood, "/",$Nwarpbad,$Npubwarps,$NWWdiffgood, "/",$NWWdiffbad,$NWWdiffpub,$NWSdiffgood, "/",$NWSdiffbad,$NWSdiffpub, "chunk incomplete, not done";}