Changeset 40478

Timestamp:

Jun 27, 2018, 3:22:45 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/ippMonitor

Files:

• . (modified) (1 prop)
• INSTALL (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• czartool/czartool/CzarDb.pm (modified) (1 diff)
• raw/czartool_labels.php (copied) (copied from trunk/ippMonitor/raw/czartool_labels.php )
• raw/czartool_labels_old.php (copied) (copied from trunk/ippMonitor/raw/czartool_labels_old.php )
• raw/getimage.php (modified) (3 diffs)
• raw/ipp.czar.dat (modified) (1 diff)
• raw/ipp.php (modified) (1 diff)
• raw/site.php.in (modified) (1 diff)
• raw/skyplot.php (modified) (3 diffs)
• scripts/skycellplot.dvo (modified) (2 diffs)
• scripts/skyplot.dvo (modified) (6 diffs)

branches/czw_branch/20170908/ippMonitor/INSTALL

@@ +1 @@
+
+# below are commands to configure ippMonitor
 
 # we have moved all user/password info into config.dat (see config.dat.in for an example)
+
+# --site defines the location of the ipp configuration site-specific information
 # note that we have a special version for ippmonitor without $PSCONFIG/$PSCONFDIR values:
+# --site ~/ippconfig/ippmonitor.config
+
+# set psconfig to use a different build from the standard ops tag.  This allows 
+# testing of those parts of ippMonitor which depend on IPP code without modifyin
+# the operational installation
+psconfig ipp-trunk-20180515
+
+# run psconfigure to generate Makefile and raw/site.php
 psconfigure --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
+
+# install the php code:
+make

branches/czw_branch/20170908/ippMonitor/Makefile.in

@@ -64 +64 @@
 $(DESTWWW)/ipp.czartool.dat \
 $(DESTWWW)/czartool_labels.php \
+$(DESTWWW)/czartool_labels_old.php \
 $(DESTWWW)/czartool_getplot.php \
 $(DESTWWW)/czartool_exposures.php \

branches/czw_branch/20170908/ippMonitor/czartool/czartool/CzarDb.pm

@@ -277 +277 @@
     my $size = scalar @{$labels};
     if ($size < 1) { return; }
-# CZW: 2014-09-12 edit to force in lanl labels
     if ($server eq 'stdscience') {
-## EAM : these should no longer be needed
-## 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}, 'snia_update';
-##        #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}, 'PSNSC.wref.20161201';
-##      push @{$labels}, 'PSNSC.wref.20170707';
-        #push @{$labels}, 'QUB.lowdec.20170707';
-        #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';
-    }
-
+        ## EAM 20180510 : manually adding label used for Pole reprocessing
+        ## I would like to add an external file to manage these extra 
+        ## labels, but this suffices for now
+        push @{$labels}, 'PV3.Pole.Reprocess.20180510';
+    }
 
     my $query = $self->{_db}->prepare(<<SQL);

branches/czw_branch/20170908/ippMonitor/raw/getimage.php

@@ -8 +8 @@
 // global $BINDIR;
 // global $SITE;
-// global $PSCONFDIR
-// global $PSCONFIG
-
 
 ### these need to be set to the correct locations!!
@@ -21 +18 @@
 }
 
-putenv("PSCONFDIR=$PSCONFDIR");
-putenv("PSCONFIG=$PSCONFIG");
 putenv("PERL5LIB=$PERLLIB:");
 $PATH = getenv("PATH");
 putenv("PATH=$BINDIR:$PATH");
+putenv("NEB_SERVER=$NEB_SERVER");
 
 if ($debug) {
@@ -120 +116 @@
   echo "status:   $status<br>";
   echo "filename: $filename<br>";
-  exit ();
+  // exit ();
 }
 

branches/czw_branch/20170908/ippMonitor/raw/ipp.czar.dat

@@ -3 +3 @@
 menutop   | menutop      | plain   |     |   
 
-menulink   | menuselect      | link    | czartool - standard          | czartool_labels.php
+menulink   | menuselect      | link    | czartool - old  | czartool_labels_old.php
+menulink   | menuselect      | link    | czartool        | czartool_labels.php
 menulink   | menuselect      | link    | mask stats                   | maskStats.php
 menulink   | menuselect      | link    | night summary                | nightSummary.php

branches/czw_branch/20170908/ippMonitor/raw/ipp.php

@@ -826 +826 @@
     // these are defined by site.php
     global $PERLLIB;
+    global $NEB_SERVER;
     global $BINDIR;
     global $SITE;
-    global $PSCONFDIR;
-    global $PSCONFIG;
-
-    putenv("PSCONFDIR=$PSCONFDIR");
-    putenv("PSCONFIG=$PSCONFIG");
     putenv("PERL5LIB=$PERLLIB:");
+
     $PATH = getenv("PATH");
     putenv("PATH=$BINDIR:$PATH");
-
-    // be careful of the definition of PATH in SITE: cannot contain HOME
-    echo "<br>ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>\n";
+    putenv("NEB_SERVER=$NEB_SERVER");
+
     exec ("ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id", $output, $status);
 
     if (0) {
+      echo "PERLLIB: $PERLLIB<br>";
+      echo "NEB_SERVER: $NEB_SERVER<br>";
       echo "basename: $basename<br>";
       for ($i = 0; $i < count($output); $i++) {
         echo "output $i: $output[$i]<br>";
       }
+      echo "path:     $PATH<br>";
       echo "output:   $output[0]<br>";
       echo "status:   $status<br>";
       echo "filename: $filename<br>";
-      exit ();
+      // exit ();
     }
 
     $filename = $output[0];
     if ($status) {
-      echo "log file ($filerule, $basename) not found<br>\n";
-      return;
+      if ($status == 1) {       
+        echo "<b>log file ($filerule, $basename) not found<br></b>\n";
+        echo "ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>";
+        return;
+      } else {
+        echo "<b>ipp_filename.pl failure, check configuration<br></b>\n";
+        echo "ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>";
+        echo "NEB_SERVER: $NEB_SERVER<br>";
+        return; 
+      }
     }
     echo "<b>log filename: $filename</b><br>\n";

branches/czw_branch/20170908/ippMonitor/raw/site.php.in

@@ -1 +1 @@
 <?php
 
-$WWWHOST = "@HOST@";
+// this file is generated by running configure in the ippMonitor directory
+// values below are set based on the binary, etc paths.
 
-$PERLLIB = "@PERLLIB@";
-$BINDIR  = "@BINDIR@";
-$LIBDIR  = "@LIBDIR@";
-$SITE    = "@SITE@";
+$WWWHOST    = "@HOST@";
 
-$PSCONFDIR = "@PSCONFDIR@";
-$PSCONFIG  = "@PSCONFIG@";
+$PERLLIB    = "@PERLLIB@";
+$BINDIR     = "@BINDIR@";
+$LIBDIR     = "@LIBDIR@";
+$SITE       = "@SITE@";
 
 $DBI     = "@DBI@";
 
-// insert config.dat here
+// insert config.dat here. this contains a number of system-specific things like
+// the names of database machines and users
+
 @CONFIG.DAT@
 

branches/czw_branch/20170908/ippMonitor/raw/skyplot.php

@@ -12 +12 @@
 $MISSING = "missing.png";
 
-### we must have been past arguments with GET:
+### XXX TEST
+# $outfile = $MISSING;
+# $file = fopen ($outfile, "r");
+# if ($file && !$debug) {
+#   header ('Content-Type: image/png');
+#   fpassthru ($file);
+# }
+# exit();
+
+
+### we must have been passed arguments with GET:
 if ($_SERVER[REQUEST_METHOD] != 'GET') { 
   exit ();
@@ -47 +57 @@
 $outfile = $_GET[output];
 
-$output = shell_exec("skyplot.dvo $infile $outfile");//, $output, $status);
+// $output = shell_exec("skyplot.dvo $infile $outfile");//, $output, $status);
+exec("skyplot.dvo $infile $outfile", $output, $status);
 
 if ($debug) {
+  echo "output from skyplot.dvo<br>\n";
   for ($i = 0; $i < count($output); $i++) {
     echo "output $i: $output[$i]<br>";
@@ -57 +69 @@
 }
 
-# use these to check the environment
-# passthru ("env");
+// use these to check the environment
+// passthru ("env");
+
 
 $file = fopen ($outfile, "r");

branches/czw_branch/20170908/ippMonitor/scripts/skycellplot.dvo

@@ -64 +64 @@
 
 macro galactic
- create l 720 -360 0.1
+ create l -360 720 0.1
  set b = l * 0
  csystem G C l b
@@ -71 +71 @@
 
 macro ecliptic
- create l 720 -360 0.1
+ create l -360 720 0.1
  set b = l * 0
  csystem E C l b

branches/czw_branch/20170908/ippMonitor/scripts/skyplot.dvo

@@ -37 +37 @@
   end
 
+  # echo "starting skyplot"
   data $1
   read r 1 d 2 f 3
 
+  # echo "read data r[]"
   resize 1000 500
   region +ns -ew 180 0 85 ait; cgrid -ra-by-hour -c grey80
@@ -45 +47 @@
   set R = r * 180/3.14
   set D = d * 180/3.14
+  # echo "calculated RA,DEC R[]"
 
   for i 0 $filters:n
     subset R1 = R if (f == $i)
     subset D1 = D if (f == $i)
+    # echo "subset R1 R1[]"
     if (R1[]) 
       cplot R1 D1 -pt $pttype:$i -sz $ptsize:$i -c $filters:$i
@@ -54 +58 @@
   end
 
+  # echo "plot ecliptic"
   style -c red -pt 0 -sz 0.5; ecliptic
+
+  # echo "plot galactic"
   style -c blue -pt 0 -sz 0.5; galactic
 
@@ -61 +68 @@
 
 macro galactic
- create l 720 -360 0.1
+ create l -360 720 0.1
  set b = l * 0
  csystem G C l b
@@ -68 +75 @@
 
 macro ecliptic
- create l 720 -360 0.1
+ create l -360 720 0.1
  set b = l * 0
  csystem E C l b
@@ -75 +82 @@
 
 if ($SCRIPT)
+  echo "starting skyplot.dvo"
+
   $KAPA = kapa -noX
   if ($argv:n != 2)