more work on status reports

Author: markmac99

archive/analysis/getLogData.sh

@@ -62,7 +62,7 @@ echo "the entire night was uncalibrated (indicated by the 'skipping' warning).</
 echo "<p>To interpret these data, see " >> $logfile
 echo "<a href=https://github.com/markmac99/ukmon-pitools/wiki/UKMON-Pi-Toolset-FAQ#Interpreting_the_Uncalibrated_Report>here</a></p>" >> $logfile
 echo "<pre>" >> $logfile
-grep "Skipping" $lastmtch >> $logfile
+grep "Skipping" $lastmtch | egrep -v "directory|pickle" >> $logfile
 echo "</pre>" >> $logfile
 
 echo "<h2 id=fails>Failed Match Report</h2>" >> $logfile

archive/ukmon_pylib/reports/getSolutionStati.py

@@ -5,93 +5,6 @@
 import sys
 
 
-def getSolutionStati(fname):
-    with open(fname, 'r') as inf:
-        lis = inf.readlines()
-    # find start of interesting data
-    totnew = 0
-    totchk = 0
-    gotnew = 0
-    gotchk = 0
-    chktraj = False
-    newtraj = False
-    for li in lis:
-        # check for new data for existing solns 
-        if 'Checking trajectory at ' in li and chktraj is False:
-            thistraj = li
-            chktraj = True
-            totchk += 1
-            continue
-        if 'Checking trajectory at ' in li and chktraj is True:
-            spls = thistraj.strip().split(' ')
-            print(f'{spls[3]} {spls[4]} no new data')
-            totchk += 1
-            thistraj = li
-            chktraj = True
-            continue
-        if "New Trajectory solution failed" in li and chktraj is True:
-            spls = thistraj.strip().split(' ')
-            print(f'{spls[3]} {spls[4]} no improvement')
-            chktraj = False
-            continue
-        if "Shower:" in li and chktraj is True:
-            spls = thistraj.strip().split(' ')
-            spl2 = li.strip().split(' ')
-            try:
-                if spl2[3] == '...':
-                    shwr = 'Spo'
-                else:
-                    shwr = spl2[3]
-            except:
-                if spl2[1] == '...':
-                    shwr = 'Spo'
-                else:
-                    shwr = spl2[1]
-
-            print(f'{spls[3]} {spls[4]} updated as {shwr}')
-            gotchk += 1
-            chktraj = False
-            continue
-
-        # check for new groups
-        if "Observations:" in li:
-            thistraj = None
-            newtraj = True
-            totnew += 1
-            continue
-        if "Observations:" not in li and newtraj is True and thistraj is None:
-            thistraj = li
-            continue
-        if "-------" in li and newtraj is True:
-            spls = thistraj.strip().split(' ')
-            print(f'{spls[3]} {spls[4]} not matched')
-            newtraj = False
-            thistraj = None
-            continue
-        if "Shower:" in li and newtraj is True:
-            spls = thistraj.strip().split(' ')
-            spl2 = li.strip().split(' ')
-            try: 
-                if spl2[3] == '...':
-                    shwr = 'Spo'
-                else:
-                    shwr = spl2[3]
-            except:
-                if spl2[1] == '...':
-                    shwr = 'Spo'
-                else:
-                    shwr = spl2[1]
-            print(f'{spls[3]} {spls[4]} solved as {shwr}')
-            gotnew += 1
-            newtraj = False
-            thistraj = None
-            continue
-        if "SOLVING RUN DONE" in li:
-            break
-
-    return totnew, totchk, gotnew, gotchk 
-
-
 def parseDistriblog(logname):
     lis = open(logname,'r').readlines()
     dta = [x for x in lis if ('added to fails' in x or ('saved' in x and 'to' in x)) and ('CorrelateEngine' in x or 'CorrelateRMS' in x)]
@@ -102,4 +15,4 @@ def parseDistriblog(logname):
 
 if __name__ == '__main__':
     fname = sys.argv[1]
-    print(parseDistriblog(fname))
+    parseDistriblog(fname)