correction to algorithm to include 60%

Author: John P. Artieda

SR_View_SSB/ActiveSites/ActiveSites.py

@@ -27,14 +27,14 @@ def extractSitesAboveThreshold(dataRows, percentageThreshold):
     for row in dataRows['data']:
         siteName = row[0].split(' ')[0]
         sitePercentage = float(row[1][0][1])
-        if sitePercentage > percentageThreshold:
+        if sitePercentage >= percentageThreshold:
             sites.append(siteName)
     return sites
 
 oneWeekDataRows = getData(url % '168', headers={"Accept":"application/json"})
 threeMonthsDataRows = getData(url % '2184', headers={"Accept":"application/json"})
 
-# Active Sites = SR >60% for last week OR last 3 months
+# Active Sites = SR >=60% for last week OR last 3 months
 oneWeek = extractSitesAboveThreshold(oneWeekDataRows, percentageThreshold)
 threeMonths = extractSitesAboveThreshold(threeMonthsDataRows, percentageThreshold)
 activeSites = oneWeek

SR_View_SSB/ActiveSites/Readme.txt

@@ -7,7 +7,7 @@ and that presently are in "active" status.
 
 --- ACTIVE sites for  SSB ---
 SSB metric: 		39 - Active T2s
-Active Sites:		SR >60% last 1 week OR last 3 months
+Active Sites:		SR >=60% last 1 week OR last 3 months
 
 --- WAITING ROOM LIST for SSB ---
 Any site that is not in this list will be automatically moved to the Waiting Room.

SR_View_SSB/ActiveSites/sActiveSites.sh

@@ -44,7 +44,7 @@ fi
 # creating output file
 cat <<EOF > $outFile
 # SSB:          metric 39 - Active T2s
-# Criteria:     ActiveSite = SR>60% last 1 week OR last 3 months
+# Criteria:     ActiveSite = SR>=60% last 1 week OR last 3 months
 # Written by:   John Artieda <artiedaj@fnal.gov>
 # Readme:
 # $Read