Index: trunk/ippMonitor/czartool/czartool/CzarDb.pm
===================================================================
--- trunk/ippMonitor/czartool/czartool/CzarDb.pm	(revision 39804)
+++ trunk/ippMonitor/czartool/czartool/CzarDb.pm	(revision 39805)
@@ -274,5 +274,5 @@
 # CZW: 2014-09-12 edit to force in lanl labels
     if ($server eq 'stdscience') {
-        push @{$labels}, 'LAP.PV3.20140730.final';
+#        push @{$labels}, 'LAP.PV3.20140730.final';
 #        push @{$labels}, 'LAP.PV3.20140730.local';
 #        push @{$labels}, 'LAP.PV3.20140730.ipp';
@@ -284,9 +284,39 @@
 #        push @{$labels}, 'LAP.PV3.20140730.diff01';
 #        push @{$labels}, 'LAP.PV3.20140730.diff01.left';
-        push @{$labels}, 'LAP.PV3.20140730.ff01.remote';
-        push @{$labels}, 'LAP.PV3.20140730.ff01';
-        push @{$labels}, 'LAP.PV3.20140730.ff01.left';
-        push @{$labels}, 'LAP.PV3W.20150312';
+#        push @{$labels}, 'LAP.PV3.20140730.ff01.remote';
+#        push @{$labels}, 'LAP.PV3.20140730.ff01';
+#        push @{$labels}, 'LAP.PV3.20140730.ff01.left';
+#        push @{$labels}, 'LAP.PV3.20140730.ff01.bulge';
+#        push @{$labels}, 'LAP.PV3W.20150312';
 #       push @{$labels}, 'SAS.20141118';
+## MEH 20150921 manuall add WS labels while in ippqub stdscience       
+        push @{$labels}, 'OSS.WS.nightlyscience';
+	push @{$labels}, 'MSS.WS.nightlyscience';
+	push @{$labels}, 'ESS.WS.nightlyscience';
+	push @{$labels}, 'ThreePi.WS.nightlyscience';
+	push @{$labels}, 'SNIa.WS.nightlyscience';
+  	push @{$labels}, 'QUB.WS.nightlyscience';	
+	push @{$labels}, 'QUB.SS.nightlyscience';
+	push @{$labels}, 'ps_ud_QUB';
+        #push @{$labels}, 'CFA.WS.nightlyscience';
+        #push @{$labels}, 'CFA.SS.nightlyscience';
+	push @{$labels}, 'FSS.WS.nightlyscience';
+	#push @{$labels}, 'NCU.ref.20161026';
+	#push @{$labels}, 'NCU.ref.20161026.update';
+        #push @{$labels}, 'NCU.WS.nightlyscience';
+        #push @{$labels}, 'NCU.SS.nightlyscience';
+        #push @{$labels}, 'QUB.lowdec.20160712';
+	#push @{$labels}, 'SAS.20151208';
+## MEH 20150928 manually add MD.PV3 WS labels too	
+	#push @{$labels}, 'MD01.PV3.WSdiff.20150312';
+	#push @{$labels}, 'MD02.PV3.WSdiff.20150312';
+	#push @{$labels}, 'MD03.PV3.WSdiff.20150312';
+	#push @{$labels}, 'MD04.PV3.WSdiff.20150312';
+	#push @{$labels}, 'MD05.PV3.WSdiff.20150312';
+	#push @{$labels}, 'MD06.PV3.WSdiff.20150312';
+	#push @{$labels}, 'MD07.PV3.WSdiff.20150312';
+	#push @{$labels}, 'MD08.PV3.WSdiff.20150312';
+	#push @{$labels}, 'MD09.PV3.WSdiff.20150312';
+	#push @{$labels}, 'MD10.PV3.WSdiff.20150312';
     }
 
@@ -964,4 +994,7 @@
         my ($host, $used, $available, $writable, $readable) = @row;
 
+	# stsci hosts are no longer with us
+	next if $host =~ /stsci/;
+
         if (($used+$available) == 0) {
           $underLimit = 1;
@@ -971,4 +1004,5 @@
           $underLimit = 1;
         }
+
 
         # Col 1: host
Index: trunk/ippMonitor/czartool/czartool/Nebulous.pm
===================================================================
--- trunk/ippMonitor/czartool/czartool/Nebulous.pm	(revision 39804)
+++ trunk/ippMonitor/czartool/czartool/Nebulous.pm	(revision 39805)
@@ -112,6 +112,8 @@
             next;
         } elsif (($line =~ m/(ipp[0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)||
-               ($line =~ m/(ippb[0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i) ||
-               ($line =~ m/(stsci[0-1][0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)) {
+               ($line =~ m/(ippb[0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)
+# these nodes are gone
+#               || ($line =~ m/(stsci[0-1][0-9]+\.[0-9]{1})\s.+[0-9]+\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)%.*/i)) 
+        ) {
 
             $self->{_totalHosts}++;
Index: trunk/ippMonitor/czartool/czartool/Pantasks.pm
===================================================================
--- trunk/ippMonitor/czartool/czartool/Pantasks.pm	(revision 39804)
+++ trunk/ippMonitor/czartool/czartool/Pantasks.pm	(revision 39805)
@@ -7,9 +7,10 @@
 
 my @servers = (
-        "addstar", 
-        "addstarlap", 
+#        "addstar", 
+#        "addstarlap",
+        "ippqub:stdscience_ws",
         "cleanup", 
-        "deepstack",
-        "detrend", 
+#        "deepstack",
+#        "detrend", 
         "distribution", 
         "pstamp", 
Index: trunk/ippMonitor/czartool/czartool/czarconfig.xml.in
===================================================================
--- trunk/ippMonitor/czartool/czartool/czarconfig.xml.in	(revision 39804)
+++ trunk/ippMonitor/czartool/czartool/czarconfig.xml.in	(revision 39805)
@@ -49,5 +49,5 @@
     <serverinterval>20 MINUTE</serverinterval>
     <!-- whitespace-separated server list for servers we want roboczar to check --> 
-    <interestedservers>stdscience distribution summitcopy registration pstamp </interestedservers>
+    <interestedservers>ippqub:stdscience_ws stdscience distribution summitcopy registration pstamp </interestedservers>
     <!-- <interestedservers>pstamp</interestedservers> -->
   </roboczar>
Index: trunk/ippMonitor/def/simplePlotSkycalImage.d
===================================================================
--- trunk/ippMonitor/def/simplePlotSkycalImage.d	(revision 39804)
+++ trunk/ippMonitor/def/simplePlotSkycalImage.d	(revision 39805)
@@ -4,5 +4,5 @@
 MENU  ipp.plots.dat
 
-WHERE skycalRun.state != 'new' 
+WHERE skycalRun.state = 'full' 
 WHERE skycalRun.skycal_id = skycalResult.skycal_id
 WHERE skycalRun.stack_id = stackRun.stack_id
Index: trunk/ippMonitor/def/simplePlotStaticskyImage.d
===================================================================
--- trunk/ippMonitor/def/simplePlotStaticskyImage.d	(revision 39804)
+++ trunk/ippMonitor/def/simplePlotStaticskyImage.d	(revision 39805)
@@ -4,5 +4,5 @@
 MENU  ipp.plots.dat
 
-WHERE staticskyRun.state != 'new' 
+WHERE staticskyRun.state = 'full' 
 WHERE staticskyRun.sky_id = staticskyResult.sky_id
 WHERE staticskyRun.sky_id = staticskyInput.sky_id
Index: trunk/ippMonitor/raw/czartool_servers.php
===================================================================
--- trunk/ippMonitor/raw/czartool_servers.php	(revision 39804)
+++ trunk/ippMonitor/raw/czartool_servers.php	(revision 39805)
@@ -33,11 +33,12 @@
 
 $servers=array(
-        "addstar", 
+        #"addstar", 
+	"ippqub:stdscience_ws",
         "cleanup", 
-        "detrend", 
+        #"detrend", 
         "distribution", 
         "pstamp", 
-        "update", 
-        "publishing", 
+        #"update", 
+        #"publishing", 
         "registration", 
         "replication",