Index: /trunk/ippMonitor/INSTALL
===================================================================
--- /trunk/ippMonitor/INSTALL	(revision 41125)
+++ /trunk/ippMonitor/INSTALL	(revision 41126)
@@ -1,2 +1,3 @@
+#!/bin/sh
 
 # below are commands to configure ippMonitor
@@ -11,9 +12,23 @@
 # testing of those parts of ippMonitor which depend on IPP code without modifyin
 # the operational installation
+# 2019.11.18 CCL: which parts of ippMonitor depends on IPP codes?  If there is not many
+#                 , just use trunk version should work fine.
 psconfig ipp-trunk-20180515
 
-# run psconfigure to generate Makefile and raw/site.php
+# run psconfigure to generate Makefile and raw/site.php (site.php.in includes CZARPLOTDIR now)
 psconfigure --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
+
+# copy these files and modify them
+cp config.dat.in config.dat
+
+# for czarpool.pl, the path needs to be defined. 
+cp czartool/czarconfig.xml.in czartool/czarconfig.xml
+# then set gnuplot path <path>/export/ipp113.0/ipp/czartool_plots</path>  --> for ipp113
+# ipp117 is set to be rsynced in crontab regularly from ipp113's path,
+# so need to remove crontab if czarpool.pl is under development 
+# then set gnuplot path <path>/export/ipp117.0/ipp/czartool_plots</path>  --> for ipp117
 
 # install the php code:
 make
+
+
Index: /trunk/ippMonitor/Makefile.in
===================================================================
--- /trunk/ippMonitor/Makefile.in	(revision 41125)
+++ /trunk/ippMonitor/Makefile.in	(revision 41126)
@@ -3,10 +3,10 @@
 	@echo "USAGE: make php"
 
-SRC     =       src
-DEF	=	def
-RAW	=	raw
-SCRIPTS =       scripts
-DESTBIN	=       @BINDIR@
-DESTWWW =       @HTDOCS@/ippMonitor
+SRC     = src
+DEF     = def
+RAW     = raw
+SCRIPTS = scripts
+DESTBIN = @BINDIR@
+DESTWWW = @HTDOCS@/ippMonitor
 
 GENERATE = $(SCRIPTS)/generate
@@ -172,5 +172,5 @@
 $(DESTWWW)/fullforceRun.php \
 $(DESTWWW)/fullforceSummary.php \
-$(DESTWWW)/failedFullforce.php \
+$(DESTWWW)/fullforce_failure.php \
 $(DESTWWW)/diffSummary.php \
 $(DESTWWW)/diffSummary_Images.php \
@@ -280,5 +280,5 @@
 $(DESTWWW)/noimage.png
 
-DESTLINK = $(DESTWWW)/index.php
+DESTLINK = $(DESTWWW)/index.php 
 
 php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK) $(PROGRAMS)
@@ -288,5 +288,5 @@
 # .PRECIOUS: $(BIN)/%.$(ARCH)
 
-$(DESTLINK): $(DESTWWW)/Login.php
+$(DESTLINK): $(DESTWWW)/Login.php 
 	rm -f $@
 	ln -s $(DESTWWW)/Login.php $@
Index: /trunk/ippMonitor/configure.tcsh
===================================================================
--- /trunk/ippMonitor/configure.tcsh	(revision 41125)
+++ /trunk/ippMonitor/configure.tcsh	(revision 41126)
@@ -134,4 +134,5 @@
 
 set hostname = `hostname -f`
+set hostname2 = `hostname`
 
 echo
@@ -182,6 +183,7 @@
 if (-e Makefile) mv -f Makefile Makefile~
 cat Makefile.in | sed "s|@HTDOCS@|$htdocs|" > tmp.1
-cat tmp.1       | sed "s|@BINDIR@|$bindir|" > Makefile
-rm -f tmp.1
+cat tmp.1       | sed "s|@HOST2@|$hostname2|"  > tmp.2
+cat tmp.2       | sed "s|@BINDIR@|$bindir|" > Makefile
+rm -f tmp.2
 
 # convert raw/site.php.in to raw/site.php
@@ -193,7 +195,8 @@
 cat tmp.1           | sed "s|@DBI@|$DBI|"        > tmp.2
 cat tmp.2           | sed "s|@HOST@|$hostname|"  > tmp.1
-awk 'BEGIN{t = 0}((t == 0) && ($1 != "@CONFIG.DAT@")){print $0}($1 == "@CONFIG.DAT@"){t = 1}' tmp.1 > raw/site.php
+cat tmp.1           | sed "s|@HOST2@|$hostname2|"  > tmp.2
+awk 'BEGIN{t = 0}((t == 0) && ($1 != "@CONFIG.DAT@")){print $0}($1 == "@CONFIG.DAT@"){t = 1}' tmp.2 > raw/site.php
 cat config.dat >> raw/site.php
-awk 'BEGIN{t = 0}(t == 1){print $0}($1 == "@CONFIG.DAT@"){t = 1}' tmp.1 >> raw/site.php
+awk 'BEGIN{t = 0}(t == 1){print $0}($1 == "@CONFIG.DAT@"){t = 1}' tmp.2 >> raw/site.php
 
 rm -f tmp.1 tmp.2
Index: /trunk/ippMonitor/czartool/czarpoll.pl
===================================================================
--- /trunk/ippMonitor/czartool/czarpoll.pl	(revision 41125)
+++ /trunk/ippMonitor/czartool/czarpoll.pl	(revision 41126)
@@ -350,6 +350,6 @@
                 print "* Performing database cleanup\n";
                 $czarDb->cleanupDateRange($yesterday, $yesterday, $config->getCzarCleanupInterval());
-                print "* Optimizing the database\n";
-                $czarDb->optimize();
+                #print "* Optimizing the database\n";
+                #$czarDb->optimize();
                 $lastDayDailyTasks = $yesterday;
             }
Index: /trunk/ippMonitor/def/fullforceInputSkyfile.d
===================================================================
--- /trunk/ippMonitor/def/fullforceInputSkyfile.d	(revision 41126)
+++ /trunk/ippMonitor/def/fullforceInputSkyfile.d	(revision 41126)
@@ -0,0 +1,17 @@
+TABLE fullForceInput, fullForceRun, warpRun
+TITLE Full Force Input Exposures 
+FILE  fullforceInputSkyfile.php
+MENU  ipp.ffs.dat
+
+WHERE fullForceRun.ff_id = fullForceInput.ff_id AND fullForceInput.warp_id = warpRun.warp_id
+
+#        field                          size  format  name           show     link to         extras
+FIELD fullForceRun.ff_id,          5, %s,     FF ID
+FIELD fullForceRun.label,           7, %s,     Label
+FIELD fullForceRun.state,           7, %s,     State
+FIELD warpRun.warp_id,            5, %s,     Warp ID
+FIELD warpRun.tess_id,             5, %s,     Tess ID
+FIELD warpRun.label,               5, %s,     warp Label
+FIELD fullForceRun.data_group,      7, %s,     data grp
+FIELD fullForceRun.dist_group,      7, %s,     dist grp
+
Index: /trunk/ippMonitor/def/fullforce_failure.d
===================================================================
--- /trunk/ippMonitor/def/fullforce_failure.d	(revision 41125)
+++ /trunk/ippMonitor/def/fullforce_failure.d	(revision 41126)
@@ -1,27 +1,26 @@
-TABLE staticskyRun JOIN staticskyResult USING (sky_id) JOIN staticskyInput USING (sky_id) JOIN stackRun USING (stack_id)
-TITLE Static Sky Failed (Log)
-FILE  failedStaticsky.php
-MENU  ipp.stack.dat
+TABLE fullForceInput JOIN warpRun USING (warp_id) JOIN fullForceRun USING (ff_id) JOIN fullForceResult USING (ff_id)
+TITLE Full Force Failed 
+FILE  fullforce_failure.php
+MENU  ipp.ffs.dat
 
-WHERE staticskyResult.fault != 0
+ARGS  ARG1 fullForceRun.ff_id=$fullForceRun.ff_id
+ARGS  ARG1 basename=$fullForceResult.path_base
 
-ARGS  ARG1   staticskyResult.path_base=$staticskyResult.path_base
+WHERE fullForceResult.fault != 0
+#        field                       size     format             name           show     link to         extras
+FIELD   fullForceRun.ff_id,             5,        %d,           FF ID
+FIELD   fullForceRun.label,             7,        %s,           Label
+FIELD   fullForceRun.state,             7,        %s,           State,     value,  fullforce_failure.php, ARG1
+FIELD   warpRun.tess_id,                5,        %s,           Tess ID
+FIELD   warpRun.label AS warpRunLabel,  5,        %s,           warp Label
+FIELD   fullForceRun.data_group,        7,        %s,           data grp
+FIELD   fullForceRun.dist_group,        7,        %s,           dist grp
+FIELD   fullForceResult.fault,          7,        %d,           fault
+FIELD   fullForceResult.quality,        7,        %d,           quality
+FIELD   fullForceResult.path_base,      7,        %s,           path_base, none
 
-#        field                          size  format  name           show     link to         extras
-FIELD staticskyRun.sky_id,          5, %d,     Sky ID
-FIELD staticskyRun.label,    	    7, %s,     Label
-FIELD staticskyRun.state,    	    7, %s,     State,		value,		staticsky_failure.php, ARG1
-FIELD stackRun.skycell_id,          5, %s,     Skycell ID
-FIELD stackRun.tess_id,             5, %s,     Tess ID
-FIELD count(stackRun.filter),       5, %d,     #Filters	
-FIELD stackRun.label,               5, %s,     Stack Label
-FIELD staticskyRun.data_group, 	    7, %s,     data grp
-FIELD staticskyRun.dist_group, 	    7, %s,     dist grp
-FIELD staticskyResult.sources,      7, %d,     n(sources)
-FIELD staticskyResult.fault,        7, %d,     fault
-FIELD staticskyResult.quality,      7, %d,     quality
-FIELD staticskyResult.path_base,    5, %s,     path_base,     none
-
-GROUP staticskyRun.sky_id
+MODE summary
+GROUP fullForceRun.ff_id
 
 TAIL PHP insert_log ('LOG.EXP');
+
Index: /trunk/ippMonitor/raw/ipp.ffs.dat
===================================================================
--- /trunk/ippMonitor/raw/ipp.ffs.dat	(revision 41126)
+++ /trunk/ippMonitor/raw/ipp.ffs.dat	(revision 41126)
@@ -0,0 +1,10 @@
+input     | ipp.menu.dat 
+
+menutop   | menutop      | plain   | &nbsp;                       | 
+menulink  | menuselect   | link    | Full Force Summary           | fullforceSummary.php
+menulink  | menuselect   | link    | Full Force Run               | fullforceRun.php
+menulink  | menuselect   | link    | Full Force Input Skyfile     | fullforceInputSkyfile.php
+menulink  | menuselect   | link    | Full Force Processed Skyfile | fullforceProcessedSkyfile.php
+menulink  | menuselect   | link    | Full Force Failed Skyfile    | fullforceFailedSkyfile.php
+menulink  | menuselect   | link    | Full Force Failed            | fullforce_failure.php
+
Index: /trunk/ippMonitor/raw/ipp.ffs.php
===================================================================
--- /trunk/ippMonitor/raw/ipp.ffs.php	(revision 41126)
+++ /trunk/ippMonitor/raw/ipp.ffs.php	(revision 41126)
@@ -0,0 +1,17 @@
+<?php 
+
+include 'ipp.php';
+
+$ID = checkID ();
+
+// require an explicit project
+if (! $ID['proj']) { projectform ($ID); }
+
+menu('ipp.ffs.dat', 'Full Force Steps', 'ipp.css', $ID['link'], $ID['proj']);
+
+// document body
+echo "full force steps<br>\n";
+
+menu_end();
+
+?>
Index: /trunk/ippMonitor/raw/ipp.php
===================================================================
--- /trunk/ippMonitor/raw/ipp.php	(revision 41125)
+++ /trunk/ippMonitor/raw/ipp.php	(revision 41126)
@@ -351,5 +351,6 @@
   // loop over the lines in the file and generate lines in the menu
   while ($line = fgetcsv ($file, 1024, "|")) {
-    if (ereg ('^[:blank:]*#', $line[0])) continue;
+    if (preg_match ("/#/", $line[0])) continue;
+ // if (ereg ('^[:blank:]*#', $line[0])) continue;
     if (count($line) < 2) continue;
 
Index: /trunk/ippMonitor/raw/site.php.in
===================================================================
--- /trunk/ippMonitor/raw/site.php.in	(revision 41125)
+++ /trunk/ippMonitor/raw/site.php.in	(revision 41126)
@@ -16,4 +16,8 @@
 // the names of database machines and users
 
+// location of plots produced by czarpoll.pl
+$CZARPLOTDIR     = "/export/@HOST2@.0/ipp/czartool_plots";
+$METRICSPLOTDIR  = "/export/@HOST2@.0/ipp/ippMetrics";
+
 @CONFIG.DAT@