Changeset 39719

Timestamp:

Sep 24, 2016, 3:29:05 PM (10 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/czw_branch/20160809

Files:

• . (modified) (1 prop)
• DataStoreServer/scripts/dsprodindex (modified) (1 diff)
• DataStoreServer/scripts/dsrootindex (modified) (2 diffs)
• DataStoreServer/web/cgi/dsgetindex (modified) (4 diffs)
• DataStoreServer/web/cgi/findskycalcmf.pl (copied) (copied from trunk/DataStoreServer/web/cgi/findskycalcmf.pl )
• DataStoreServer/web/cgi/findsmf.pl (modified) (2 diffs)
• DataStoreServer/web/cgi/listsmfs.pl (copied) (copied from trunk/DataStoreServer/web/cgi/listsmfs.pl )
• DataStoreServer/web/doc (copied) (copied from trunk/DataStoreServer/web/doc )
• DataStoreServer/web/php/getskycalcmf.php (copied) (copied from trunk/DataStoreServer/web/php/getskycalcmf.php )
• DataStoreServer/web/php/getsmf.php (modified) (5 diffs)
• DataStoreServer/web/php/listsmfs.php (copied) (copied from trunk/DataStoreServer/web/php/listsmfs.php )
• Nebulous-Server (modified) (1 prop)
• Nebulous-Server/bin/neb-initdb (modified) (8 diffs)
• Nebulous-Server/bin/neb-voladm (modified) (1 diff)
• Nebulous-Server/bin/nebdiskd (modified) (1 diff)
• Ohana (modified) (1 prop)
• Ohana/src/delstar/Makefile (modified) (2 diffs)
• Ohana/src/delstar/include/delstar.h (modified) (3 diffs)
• Ohana/src/delstar/src/args.c (modified) (4 diffs)
• Ohana/src/delstar/src/delete_duplicate_measures.c (modified) (3 diffs)
• Ohana/src/delstar/src/delstar.c (modified) (1 diff)
• Ohana/src/delstar/src/delstar_client.c (modified) (1 diff)
• Ohana/src/kapa2/src/Graphs.c (modified) (1 diff)
• Ohana/src/libdvo/include/dvo.h (modified) (1 diff)
• Ohana/src/libdvo/src/dbExtractMeasures.c (modified) (1 diff)
• Ohana/src/libdvo/src/dvo_photcode_ops.c (modified) (1 diff)
• Ohana/src/libkapa/src/KapaWindow.c (modified) (2 diffs)
• Ohana/src/relastro/Makefile (modified) (2 diffs)
• Ohana/src/relastro/include/relastro.h (modified) (2 diffs)
• Ohana/src/relastro/src (modified) (1 prop)
• Ohana/src/relastro/src/RepairObjectIDs.c (copied) (copied from trunk/Ohana/src/relastro/src/RepairObjectIDs.c )
• Ohana/src/relastro/src/RepairStacks.c (copied) (copied from trunk/Ohana/src/relastro/src/RepairStacks.c )
• Ohana/src/relastro/src/StackImageMaps.c (modified) (2 diffs)
• Ohana/src/relastro/src/UpdateObjectOffsets.c (modified) (2 diffs)
• Ohana/src/relastro/src/args.c (modified) (4 diffs)
• Ohana/src/relastro/src/relastro.c (modified) (1 diff)
• Ohana/src/relastro/src/relastro_client.c (modified) (1 diff)
• ippToPsps/jython/fits.py (modified) (3 diffs)
• ippToPsps/jython/objectbatch.py (modified) (1 diff)
• ippconfig/Makefile.am (modified) (1 diff)
• ippconfig/configure.ac (modified) (1 diff)
• ippconfig/dvo.photcodes (modified) (1 diff)
• ippconfig/hsc/Makefile.am (copied) (copied from trunk/ippconfig/hsc/Makefile.am )
• ippconfig/hsc/camera.config (modified) (1 diff)
• ippconfig/hsc/format_mef.config (modified) (1 diff)
• ippconfig/recipes/nightly_science.config (modified) (3 diffs)
• ippconfig/tc3/Makefile.am (modified) (1 diff)
• psconfig/tagsets/ipp-3.0.dist (modified) (1 diff)
• tools/heather/pv3slicer/slicebatch_ST.py (modified) (3 diffs)
• tools/heather/pv3slicer/st.txt (copied) (copied from trunk/tools/heather/pv3slicer/st.txt )

branches/czw_branch/20160809/DataStoreServer/scripts/dsprodindex

@@ -75 +75 @@
         #
         # XXX: the spec doesn't say what should happen in this case.
-        # Here we follow the conductor implementation and return the whole list.
-        # This may not be the right thing to do. It might be better to throw an error
+        # We used to follow the conductor implementation and return the whole list.
+        # but that is definitely not the right thing to do in our context.
+        # Exit with an error
+        exit 404;
     }
 }

branches/czw_branch/20160809/DataStoreServer/scripts/dsrootindex

@@ -14 +14 @@
 my $PS_EXIT_CONFIG_ERROR = 3;
 
+# set this variable to redirect listings of the root datastore directory
+# to the password protected php page on the postage stamp server web site.
+# Since the data store is restricted by IP address now this is no longer necessary
+my $redirect_root_to_pstamp = 0;
+if ($redirect_root_to_pstamp) {
+
+        print '
+        <html>
+        <head>
+        <meta HTTP-EQUIV="REFRESH" content="0; url=http://pstamp.ipp.ifa.hawaii.edu/dsroot.php">
+        </head>
+        </html>
+        ';
+
+        exit 0;
+}
+
 my $dbh = getDBHandle();
 
-my $stmt = $dbh->prepare("SELECT * FROM dsProduct");
+my $stmt = $dbh->prepare("SELECT * FROM dsProduct ORDER BY type");
 $stmt->execute();
 
@@ -36 +53 @@
         $row->{type}, $row->{description};
 
+    # XXX EAM : security by obfuscation
     print $line;
 }

branches/czw_branch/20160809/DataStoreServer/web/cgi/dsgetindex

@@ -20 +20 @@
 my $PS_EXIT_CONFIG_ERROR = 3;
 my $PS_EXIT_DATA_ERROR = 5;
+
+my $redirect_root_to_pstamp = 0;
 
 my $uri = shift;
@@ -132 +134 @@
             print @$stdout_buf;
         }
+        $error_code = 0 if !defined $error_code;
     } else {
         if (0 && $html_mode) {
@@ -199 +202 @@
 
         # return link
-        print a({-href=>"./index.txt"}, "Text Version");
+        if (!$redirect_root_to_pstamp || $program ne "dsrootindex") {
+            print a({-href=>"./index.txt"}, "Text Version");
+        }
 
         if ($#path >= 1) {
-            print "&nbsp&nbsp&nbsp&nbsp\n";
-
-            my $up = join('/', @path[0..$#path-1]);
-            print a({-href=>".."}, "Up to $up");
-
+            # including the up links in the data store display causes 
+            # wget -r to follow them up which makes a mess
+            # Turn them off if the user agent looks like wget
+            my $display_up_links = (lc($ENV{HTTP_USER_AGENT}) =~ /wget/) ? 0 : 1;
+            if ($display_up_links) {
+                print "&nbsp&nbsp&nbsp&nbsp\n";
+                my $up = join('/', @path[0..$#path-1]);
+                if ($redirect_root_to_pstamp and $program eq "dsprodindex") {
+                    print a({-href=>"http://pstamp.ipp.ifa.hawaii.edu/dsroot.php"}, "Up to $up");
+                } elsif ($program eq 'dsrootindex') {
+                    # no up link in dsroot
+                } else {
+                    print a({-href=>".."}, "Up to $up");
+                }
+            }
         }
         print "</p>\n";
@@ -244 +259 @@
     if ($nolink) {
        print $toks[0];
-    }
-
-    else {
-                # assumes id is always first field
-            my $wpath = "./$toks[0]";
-
-            # if this is a file request, use a download cgi
-            if ($wpath =~ /\.fits\s*$/) {
-                # This doesn't work through the proxy
-                # The /ds-cgi gets tried on alala
-                #    $wpath = '/ds-cgi/dsfits.cgi?'.substr($wpath, 4); # strip' /ds/'
+    } else {
+         # First column is link to an entity down one level in data store (product, fileset, file)
+         # assumes id is always first field
+         my $wpath = "./$toks[0]";
+
+         # if this is a file request, use a download cgi
+         my $fits = 0;
+         if ($wpath =~ /\.fits\s*$/) {
+             # This doesn't work through the proxy
+             # The /ds-cgi gets tried on alala
+             #    $wpath = '/ds-cgi/dsfits.cgi?'.substr($wpath, 4); # strip' /ds/'
+             $fits = 1;
+         }
+
+        if ($fits) {
+            print a({-href=>$wpath, -type=>'image/x-fits'}, $toks[0]);
+        } else {
+            print a({-href=>$wpath}, $toks[0]);
+        }
+
+        if ($program eq 'dsrootindex') {
+            # for root listing make most recent fileset a link as well unless there are no filesets
+            my $fileset = $toks[1];
+            $fileset =~ s/^\s+//;
+            $fileset =~ s/\s+$//;
+            if ($fileset ne 'none') {
+                print "</$celltag>";
+                print "<$celltag>";
+                # drop the product from the list of tokens
+                my $product = shift @toks;
+                # elmiminate any whitesapace
+                $product =~ s/^\s+//;
+                $product =~ s/\s+$//;
+                print a({-href=>"./$product/$fileset"}, $fileset);
             }
-
-        print a({-href=>$wpath, -type=>'image/x-fits'}, $toks[0]);
-    }
+        }
+    }
+    shift @toks;
 
     print "</$celltag>";
 
-    foreach my $val (@toks[1..$#toks]) {
+    # foreach my $val (@toks[1..$#toks]) {
+    foreach my $val (@toks) {
                 print "<$celltag>";
                 print $val;

branches/czw_branch/20160809/DataStoreServer/web/cgi/findsmf.pl

@@ -35 +35 @@
 
 # NOTE: We do not use the ipp configuration to simplify running from a CGI script
-my $dbname = "XXX";
-my $dbserver = "XXX";
-my $dbuser = "XXX";
-my $dbpassword = "XXX";
+my $dbname = "gpc1";
+my $dbserver = "scidbm";
+my $dbuser = "ippuser";
+my $dbpassword = "ippuser";
 
 
@@ -77 +77 @@
         exit 2 if (!$resolved) 
     }
+    # HERE IS THE OUTPUT FOR A SUCCESSFUL LOOKUP
     print "$filename $resolved";
 } else {

branches/czw_branch/20160809/DataStoreServer/web/php/getsmf.php

@@ -5 +5 @@
 // To just list use wget 'http://ippc17/ipp-misc/getsmf.php?exp_name=o5732g0036o&list=1'
 
-// Only configuration variable here, the location of the cgi script to find smf files
-$command = "/data/ippc17.0/datastore/ds-cgi/findsmf.pl";
-
-$rvar_exp_name = "";
-$rvar_cam_id = "";
-$rvar_data_group = "";
-$rvar_list = 0;
 
 $error_string = "";
 $debug = 0;
-
-# import_request_variables("g", "rvar_");
 
 $rvar_exp_name = getVar('exp_name');
@@ -24 +15 @@
 $rvar_data_group = getVar('data_group');
 $rvar_list = getVar('list');
+
+$command = "/data/ippc17.0/datastore/ds-cgi/findsmf.pl";
 
 # cam_id takes priority
@@ -38 +31 @@
 if ($command) {
     if ($rvar_release) {
-        $command .= " --release $release";
+        if ($rvar_release == "3PI.GR1") {
+            $rvar_release = "3PI.PV1";
+        }
+        $command .= " --release $rvar_release";
     } 
     if ($rvar_data_group) {
@@ -69 +65 @@
             }
         } else {
-            echo "unexpected output from $command: $output[0] $output[1]\n";
+            echo "<br>unexpected output from $command: $output[0] $output[1]\n";
         }
     } else {
         if ($debug) {
-            echo "command failed $command_status\n";
+            echo "<br>command failed $command_status\n";
         }
     }
@@ -92 +88 @@
         readfile($pathname);
     } else {
-        echo "smf file name is $filename<br>\nfile is $pathname\n";
+        echo "smf : $filename\n";
+        # echo "path: $pathname\n";
     }
-
 } else {
     // XXX: Figure out how to stop wget from redirecting these error

branches/czw_branch/20160809/Nebulous-Server/bin/neb-initdb

@@ -18 +18 @@
 
 my ($db, $dbhost, $dbuser, $dbpass);
-
-$db     = $ENV{'NEB_DB'} unless $db;
-$dbhost = $ENV{'NEB_DBHOST'} || 'localhost';
-$dbuser = $ENV{'NEB_USER'} unless $dbuser;
-$dbpass = $ENV{'NEB_PASS'} unless $dbpass;
+my ($trap, $actually_do_it);
+# Removed default options using environment variables because it's too dangerous.
 
 GetOptions(
@@ -29 +26 @@
     'user=s'    => \$dbuser,
     'pass=s'    => \$dbpass,
+    'yes_i_know_what_im_doing'  => \$trap,
+    'yes_i_know_what_im_doing_really=s' => \$actually_do_it,
 ) || pod2usage( 2 );
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --db --user --pass", -exitval => 2 )
-    unless $db && $dbuser && $dbpass;
+pod2usage( -msg => "Required options: --db --user --pass --host", -exitval => 2 )
+    unless $db && $dbuser && $dbpass && $dbhost;
+pod2usage( -msg => "Aborting due to mistake in options.  Check code.", -exitval => 2) if ($trap);
+pod2usage( -msg => "Aborting due to mistake in options.  Check code.", -exitval => 2) unless (defined($actually_do_it));
+if ($actually_do_it ne 'this_is_intentionally_difficult') {
+    pod2usage( -msg => "Aborting due to mistake in options.  Check code.", -exitval => 2);
+}
 
 my $dbh = DBI->connect(
@@ -48 +52 @@
 my $sql = Nebulous::Server::SQL->new();
 
-print "Dropping any existing tables...";
+print "Not dropping any existing tables because that's dangerous...";
+#
+#foreach my $statement (@{ $sql->get_db_clear }) {
+#    $dbh->do( $statement );
+#}
 
-foreach my $statement (@{ $sql->get_db_clear }) {
-    $dbh->do( $statement );
-}
-
-print " OK\nCreating new tables...";
+print " OK!\nCreating new tables...";
 
 foreach my $statement (@{ $sql->get_db_schema }) {
-    $dbh->do( $statement );
+    eval {
+        $dbh->do( $statement );
+    };
+    if ($@) {
+        die "Error received: $@\n";
+    }
 }
 
@@ -72 +81 @@
 =head1 SYNOPSIS
 
-    neb-initdb [--db <database>] [--user <username>] [--pass <password>]
+    neb-initdb [--db <database>] [--user <username>] [--pass <password>] [--host <dbhost>]
 
 =head1 DESCRIPTION
@@ -78 +87 @@
 This program initialize a database for use by L<Nebulous::Server> by creating
 the appropriate set of tables.  Any pre-existing tables with conflicting names
-are first removed.
+are first removed.  This help file intentionally does not tell you how to make
+the program actually work.
 
 =head1 OPTIONS
@@ -84 +94 @@
 =over 4
 
-=item * --db|-d <database>
+=item * --db <database>
 
 Name of database (C<namespace>) to create tables in.
 
-Optional if the appropriate environment variable is set.
 
-=item * --user|-u <username>
+=item * --user <username>
 
 Username to authenticate with.
 
-Optional if the appropriate environment variable is set.
 
-=item * --pass|-p <password>
+=item * --pass <password>
 
 Password to authenticate with.
 
-Optional if the appropriate environment variable is set.
+=item * --host <dbhost>
+
+Host to generate the database tables on.
 
 =back
@@ -106 +116 @@
 =head1 ENVIRONMENT
 
-These environment variables may be used in place of the specified command line
-options.  All command line option will override the corresponding environment
-value.
-
-=over 4
-
-=item * C<NEB_DB>
-
-Equivalent to --db|-d
-
-=item * C<NEB_USER>
-
-Equivalent to --user|-u
-
-=item * C<NEB_PASS>
-
-Equivalent to --pass|-p 
-
-=back
-
-=head1 CREDITS
-
-Just me, myself, and I.
+No environment variables interact with this program.
 
 =head1 SUPPORT
@@ -134 +122 @@
 Please contact the author directly via e-mail.
 
-=head1 AUTHOR
-
-Joshua Hoblitt <jhoblitt@cpan.org>
-
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2007  Joshua Hoblitt.  All rights reserved.
+Copyright (C) 2005-2016  IPP.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under

branches/czw_branch/20160809/Nebulous-Server/bin/neb-voladm

@@ -68 +68 @@
         if (defined $allocate and $allocate !~ m/^[01]$/)
         or (defined $available and $available !~ m/^[01]$/)
-        or (defined $xattr and $xattr !~ m/^[0123]$/);
+        or (defined $xattr and $xattr !~ m/^[01235]$/);
 }
 

branches/czw_branch/20160809/Nebulous-Server/bin/nebdiskd

@@ -198 +198 @@
             # there may be multiple vol_ids per mountpoint but we only need to
             # check each mountpoint once
-            my $query = $dbh->prepare_cached("SELECT DISTINCT host, mountpoint FROM volume");
+            my $query = $dbh->prepare_cached("SELECT DISTINCT host, mountpoint FROM volume WHERE xattr != 5");
             $query->execute;
             while (my $row = $query->fetchrow_hashref) {

branches/czw_branch/20160809/Ohana/src/delstar/Makefile

@@ -31 +31 @@
 $(SRC)/delete_duplicate_images.$(ARCH).o \
 $(SRC)/delete_duplicate_measures.$(ARCH).o \
+$(SRC)/delete_measures_by_match.$(ARCH).o \
 $(SRC)/delete_fix_LAP.$(ARCH).o \
 $(SRC)/delete_fix_LAP_edges.$(ARCH).o \
@@ -56 +57 @@
 $(SRC)/delete_duplicate_images.$(ARCH).o \
 $(SRC)/delete_duplicate_measures.$(ARCH).o \
+$(SRC)/delete_measures_by_match.$(ARCH).o \
 $(SRC)/delete_fix_LAP.$(ARCH).o \
 $(SRC)/delete_fix_LAP_edges.$(ARCH).o \

branches/czw_branch/20160809/Ohana/src/delstar/include/delstar.h

@@ -93 +93 @@
 
 int   SAVE_DUPLICATES;
+int   SAVE_DELETES;
 int   SKIP_IMAGES;
 char *BACKUP_EXTNAME;
@@ -104 +105 @@
 
 int    MODE;
-enum {MODE_NONE, MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED, MODE_PHOTCODES, MODE_DUP_IMAGES, MODE_DUP_MEASURES, MODE_FIX_LAP, MODE_FIX_LAP_STATS, MODE_FIX_LAP_EDGES, MODE_FIX_LAP_EDGES_DELETE};
+enum {MODE_NONE, MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED, MODE_PHOTCODES, MODE_DUP_IMAGES, MODE_DUP_MEASURES, MODE_DELETE_MEASURES_BY_MATCH, MODE_FIX_LAP, MODE_FIX_LAP_STATS, MODE_FIX_LAP_EDGES, MODE_FIX_LAP_EDGES_DELETE};
 
 char DateKeyword[64], DateMode[64], UTKeyword[64], MJDKeyword[64], JDKeyword[64];
@@ -185 +186 @@
 int ImageIDSave(char *filename, IndexArray *imageID);
 
+int delete_measures_by_match ();
+int delete_measures_by_match_parallel (SkyList *sky);
+DeleteMeasureResult delete_measures_by_match_catalog (Catalog *catalog);
+
 int delete_duplicate_measures ();
 int delete_duplicate_measures_parallel (SkyList *sky);

branches/czw_branch/20160809/Ohana/src/delstar/src/args.c

@@ -12 +12 @@
   fprintf (stderr, "  delstar -dup-images : delete duplicate images (by externID)\n\n");
   fprintf (stderr, "  delstar -dup-measures : delete duplicate measures (by imageID + detID)\n\n");
+  fprintf (stderr, "  delstar -delete-measures-by-match : delete duplicate measures by imageID, photcode, time constratins\n\n");
   fprintf (stderr, "  optional flags:\n");
   fprintf (stderr, "  -v               : verbose mode\n");
@@ -194 +195 @@
     SKIP_IMAGES = TRUE; // we do not need to load the images for -dup-measures
   }
+  if ((N = get_argument (argc, argv, "-delete-measures-by-match"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_DELETE_MEASURES_BY_MATCH;
+    remove_argument (N, &argc, argv);
+    SKIP_IMAGES = TRUE; // we do not need to load the images for -dup-measures
+  }
 
   DELETE_MIN_DET_ID = 0;
@@ -222 +229 @@
     remove_argument (N, &argc, argv);
   }
+
   BACKUP_EXTNAME = NULL;
   if ((N = get_argument (argc, argv, "-backup-extname"))) {
@@ -229 +237 @@
   }
   if (!BACKUP_EXTNAME) BACKUP_EXTNAME = strcreate (".bck");
+
+  SAVE_DELETES = FALSE;
+  if ((N = get_argument (argc, argv, "-save-deletes"))) {
+    SAVE_DELETES = TRUE;
+    remove_argument (N, &argc, argv);
+  }
 
   if ((N = get_argument (argc, argv, "-fix-LAP"))) {

branches/czw_branch/20160809/Ohana/src/delstar/src/delete_duplicate_measures.c

@@ -373 +373 @@
   }
     
-# if (0)
+# if (1)
   FILE *fsave = NULL;
   if (SAVE_DUPLICATES) {
@@ -408 +408 @@
     off_t N = measure[j].averef;
     if (VERBOSE) fprintf (stderr, "0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
-//  if (fsave) {
-//    fprintf (fsave, "0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
-//  }
+    if (fsave) {
+      fprintf (fsave, "0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
+    }
     if (isGPC1chip(measure[j].photcode)) {
       result.NdelChip ++;
@@ -426 +426 @@
   }
   
-  // if (fsave) fclose (fsave);
+  if (fsave) fclose (fsave);
 
   // set up the measure sequence lists

branches/czw_branch/20160809/Ohana/src/delstar/src/delstar.c

@@ -27 +27 @@
     case MODE_DUP_MEASURES:
       if (!delete_duplicate_measures ()) exit (1);
+      delstar_args_free ();
+      ohana_memcheck (TRUE);
+      ohana_memdump (TRUE);
+      exit (0);
+      break;
+    case MODE_DELETE_MEASURES_BY_MATCH:
+      if (!delete_measures_by_match ()) exit (1);
       delstar_args_free ();
       ohana_memcheck (TRUE);

branches/czw_branch/20160809/Ohana/src/delstar/src/delstar_client.c

@@ -31 +31 @@
       if (!delete_duplicate_measures ()) exit (1);
       delstar_client_args_free ();
+      ohana_memcheck (TRUE);
+      ohana_memdump (TRUE);
+      exit (0);
+      break;
+    case MODE_DELETE_MEASURES_BY_MATCH:
+      if (!delete_measures_by_match ()) exit (1);
+      delstar_args_free ();
       ohana_memcheck (TRUE);
       ohana_memdump (TRUE);

branches/czw_branch/20160809/Ohana/src/kapa2/src/Graphs.c

@@ -26 +26 @@
     graph[0].axis[i].fMinor = 5.0;
   }    
-  graph[0].data.ticktextPad = NAN;
 
-  graph[0].data.labelPadXm = NAN;
-  graph[0].data.labelPadXp = NAN;
-  graph[0].data.labelPadYm = NAN;
-  graph[0].data.labelPadYp = NAN;
-
-  graph[0].data.padXm = NAN;
-  graph[0].data.padXp = NAN;
-  graph[0].data.padYm = NAN;
-  graph[0].data.padYp = NAN;
-
-  graph[0].data.fLabelRangeXm = 1.0;
-  graph[0].data.fLabelRangeXp = 1.0;
-  graph[0].data.fLabelRangeYm = 1.0;
-  graph[0].data.fLabelRangeYp = 1.0;
-
-  graph[0].data.fMinorXm = 5.0;
-  graph[0].data.fMinorXp = 5.0;
-  graph[0].data.fMinorYm = 5.0;
-  graph[0].data.fMinorYp = 5.0;
+  KapaInitGraph (&graph[0].data);
 
   for (i = 0; i < 8; i++) {
     strcpy (graph[0].label[i].text, "");
   }
-
-  graph[0].data.xmin = 0.0;
-  graph[0].data.xmax = 1.0;
-  graph[0].data.ymin = 0.0;
-  graph[0].data.ymax = 1.0;
-
-  graph[0].data.style   = 2;            // points
-  graph[0].data.ptype   = 2;            // + for points
-  graph[0].data.ltype   = 0;            // solid line
-  graph[0].data.etype   = 0;            // no error bars
-  graph[0].data.ebar    = 0;            // no cross bar
-  graph[0].data.color   = 0;            // black
-  graph[0].data.lweight = 0.5;          // line weight of 0.5
-  graph[0].data.size    = 1.0;          // point size of 1.0
-
-  graph[0].data.flipeast = TRUE;        // +East  = -X by default
-  graph[0].data.flipnorth = FALSE;      // +North = +Y by default
-
-  InitCoords (&graph[0].data.coords, "DEC--LIN");
-  strcpy (graph[0].data.axis, "2222");
-  strcpy (graph[0].data.ticks, "2222");
-  strcpy (graph[0].data.labels, "2222");
 
   graph[0].Nobjects = 0;

branches/czw_branch/20160809/Ohana/src/libdvo/include/dvo.h

@@ -921 +921 @@
 float PhotFluxCatErr (Measure *measure, dvoMagClassType class);
 float PhotFluxAveErr (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source);
+float PhotFluxSysErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class);
+float PhotFluxRelErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class);
 
 float PhotXm (PhotCode *code, Average *average, SecFilt *secfilt);

branches/czw_branch/20160809/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -228 +228 @@
               break;
             case MAG_LEVEL_SYS:
+              value.Flt = PhotFluxSysErr (measure, average, secfilt, field->magClass); 
+              break;
             case MAG_LEVEL_REL:
+              value.Flt = PhotFluxRelErr (measure, average, secfilt, field->magClass); 
+              break;
             case MAG_LEVEL_CAL:
-              // value.Flt = PhotFluxErr (measure, field->magClass);  
+              // XXX not defined
               break;
             case MAG_LEVEL_AVE:
+              value.Flt = PhotFluxAveErr (equiv, average, secfilt, field->magClass, field->magSource);  
+              break;
             case MAG_LEVEL_REF:
-              // value.Flt = PhotFluxAveErr (equiv, average, secfilt, field->magClass, field->magSource);  
+              // XXX not defined
               break;
             case MAG_LEVEL_NONE:

branches/czw_branch/20160809/Ohana/src/libdvo/src/dvo_photcode_ops.c

@@ -1507 +1507 @@
   }
   return (dFcat);
+}
+
+float PhotFluxSysErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class) {
+
+  int Np = photcodes[0].hashcode[measure[0].photcode];
+  if (Np == -1) return (NAN);
+  PhotCode *code = &photcodes[0].code[Np];
+
+  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
+  float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
+  float Moff = Mcal - ZERO_POINT + 8.9;
+  float Foff = 3630.8 * MagToFlux(Mcal);
+
+  // use dFlux if we can, but use dMag if we must:
+  // dFlux = Flux * dMag
+
+  float dFcat = NAN;
+  switch (class) {
+    case MAG_CLASS_PSF:
+      if (isnan (measure[0].dFluxPSF)) {
+        float Finst = MagToFlux(measure[0].M + Moff);
+        dFcat = measure[0].dM * Finst;
+      } else {
+        dFcat = measure[0].dFluxPSF * Foff;
+      }
+      break;
+    case MAG_CLASS_KRON:
+      if (isnan (measure[0].dFluxKron)) {
+        float Finst = MagToFlux(measure[0].Mkron + Moff);
+        dFcat = measure[0].dMkron * Finst;
+      } else {
+        dFcat = measure[0].dFluxKron * Foff;
+      }
+      break;
+    case MAG_CLASS_APER:
+      if (isnan (measure[0].dFluxAp)) {
+        float Finst = MagToFlux(measure[0].Map + Moff);
+        dFcat = measure[0].dMap * Finst;
+      } else {
+        dFcat = measure[0].dFluxAp * Foff;
+      }
+      break;
+    default:
+      break;
+  }
+
+  /* color correction */
+  float mc = PhotColorForCode (average, secfilt, NULL, code);
+  if (isnan(mc)) return (dFcat);
+  mc -= SCALE*code[0].dX;
+
+  double Mc = mc;
+  float Mcol = 0;
+  int i = 0;
+  for (i = 0; i < code[0].Nc; i++) {
+    Mcol += code[0].X[i]*Mc;
+    Mc *= mc;
+  }
+  float Fcol = MagToFlux (Mcol);
+
+  float dFsys = dFcat * Fcol;
+
+  return (dFsys);
+}
+
+float PhotFluxRelErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class) {
+
+  int Np = photcodes[0].hashcode[measure[0].photcode];
+  if (Np == -1) return (NAN);
+  PhotCode *code = &photcodes[0].code[Np];
+
+  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
+  float Mflat = isfinite(measure[0].Mflat) ? measure[0].Mflat : 0.0;
+  float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal - Mflat;
+  float Moff = Mcal - ZERO_POINT + 8.9;
+  float Foff = 3630.8 * MagToFlux(Mcal);
+
+  // use dFlux if we can, but use dMag if we must:
+  // dFlux = Flux * dMag
+
+  float dFcat = NAN;
+  switch (class) {
+    case MAG_CLASS_PSF:
+      if (isnan (measure[0].dFluxPSF)) {
+        float Finst = MagToFlux(measure[0].M + Moff);
+        dFcat = measure[0].dM * Finst;
+      } else {
+        dFcat = measure[0].dFluxPSF * Foff;
+      }
+      break;
+    case MAG_CLASS_KRON:
+      if (isnan (measure[0].dFluxKron)) {
+        float Finst = MagToFlux(measure[0].Mkron + Moff);
+        dFcat = measure[0].dMkron * Finst;
+      } else {
+        dFcat = measure[0].dFluxKron * Foff;
+      }
+      break;
+    case MAG_CLASS_APER:
+      if (isnan (measure[0].dFluxAp)) {
+        float Finst = MagToFlux(measure[0].Map + Moff);
+        dFcat = measure[0].dMap * Finst;
+      } else {
+        dFcat = measure[0].dFluxAp * Foff;
+      }
+      break;
+    default:
+      break;
+  }
+
+  /* color correction */
+  float mc = PhotColorForCode (average, secfilt, NULL, code);
+  if (isnan(mc)) return (dFcat);
+  mc -= SCALE*code[0].dX;
+
+  double Mc = mc;
+  float Mcol = 0;
+  int i = 0;
+  for (i = 0; i < code[0].Nc; i++) {
+    Mcol += code[0].X[i]*Mc;
+    Mc *= mc;
+  }
+  float Fcol = MagToFlux (Mcol);
+
+  float dFrel = dFcat * Fcol;
+
+  return (dFrel);
 }
 

branches/czw_branch/20160809/Ohana/src/libkapa/src/KapaWindow.c

@@ -93 +93 @@
   graphdata[0].xmin = graphdata[0].ymin = 0.0;
   graphdata[0].xmax = graphdata[0].ymax = 1.0;
-  graphdata[0].style = graphdata[0].ptype = 0;
+
+  graphdata[0].style = graphdata[0].ptype = 2;
   graphdata[0].ltype = graphdata[0].color = 0;
   graphdata[0].etype = graphdata[0].ebar = 0;
@@ -117 +118 @@
   graphdata[0].padYm = NAN;
   graphdata[0].padYp = NAN;
+
+  graphdata[0].fLabelRangeXm = 1.0;
+  graphdata[0].fLabelRangeXp = 1.0;
+  graphdata[0].fLabelRangeYm = 1.0;
+  graphdata[0].fLabelRangeYp = 1.0;
+
+  graphdata[0].fMinorXm = 5.0;
+  graphdata[0].fMinorXp = 5.0;
+  graphdata[0].fMinorYm = 5.0;
+  graphdata[0].fMinorYp = 5.0;
 
   return (TRUE);

branches/czw_branch/20160809/Ohana/src/relastro/Makefile

@@ -26 +26 @@
 RELASTRO = \
 $(SRC)/CheckMeasureToImage.$(ARCH).o \
+$(SRC)/RepairObjectIDs.$(ARCH).o \
+$(SRC)/RepairStacks.$(ARCH).o \
 $(SRC)/RepairStackMeasures.$(ARCH).o \
 $(SRC)/StackImageMaps.$(ARCH).o \
@@ -114 +116 @@
 RELASTRO_CLIENT = \
 $(SRC)/CheckMeasureToImage.$(ARCH).o \
+$(SRC)/RepairObjectIDs.$(ARCH).o \
+$(SRC)/RepairStacks.$(ARCH).o \
 $(SRC)/RepairStackMeasures.$(ARCH).o \
 $(SRC)/StackImageMaps.$(ARCH).o \

branches/czw_branch/20160809/Ohana/src/relastro/include/relastro.h

@@ -31 +31 @@
 typedef enum {FIT_NONE, FIT_AVERAGE, FIT_PM_ONLY, FIT_PAR_ONLY, FIT_PM_AND_PAR} FitMode;
 
-typedef enum {OP_NONE, OP_IMAGES, OP_HIGH_SPEED, OP_MERGE_SOURCE, OP_UPDATE_OBJECTS, OP_UPDATE_OFFSETS, OP_LOAD_OBJECTS, OP_HPM, OP_PARALLEL_REGIONS, OP_PARALLEL_IMAGES, OP_REPAIR_WARPS} RelastroOp;
+typedef enum {OP_NONE, OP_IMAGES, OP_HIGH_SPEED, OP_MERGE_SOURCE, OP_UPDATE_OBJECTS, OP_UPDATE_OFFSETS, OP_LOAD_OBJECTS, OP_HPM, OP_PARALLEL_REGIONS, OP_PARALLEL_IMAGES, OP_REPAIR_STACKS, OP_REPAIR_WARPS, OP_REPAIR_OBJECT_ID} RelastroOp;
 
 typedef enum {TARGET_NONE, TARGET_SIMPLE, TARGET_CHIPS, TARGET_MOSAICS} FitTarget;
@@ -864 +864 @@
 uint64_t CreatePSPSDetectionID(double tobs, int ccdid, int detID);
 
+int RepairStacks (SkyList *skylist, int hostID, char *hostpath);
+
+int RepairObjectIDs (SkyList *skylist, int hostID, char *hostpath);
+
 void sort_by_ra (double *R, double *D, int *I, int *S, int N);
 void FreeStackGroups (void);

branches/czw_branch/20160809/Ohana/src/relastro/src/StackImageMaps.c

@@ -87 +87 @@
   // we have the stack centers; find all stacks within 0.3 degrees of this point
   Rstk = ohana_normalize_angle (Rstk);
-  double dD = 0.3;
+  double dD = 0.4;
   double dR = dD / cos(RAD_DEG*Dstk);
   double Rmin = Rstk - dR;
@@ -93 +93 @@
   double Dmin = Dstk - dD;
   double Dmax = Dstk + dD;
+
+  // for the north pole, just test the whole circle
+  if (Dstk > 88) {
+    Rmin = 0.0;
+    Rmax = 360.0;
+  }
 
   double dPosMin = NAN;

branches/czw_branch/20160809/Ohana/src/relastro/src/UpdateObjectOffsets.c

@@ -194 +194 @@
     if (USE_FIXED_PIXCOORDS) strextend (&command, "-D USE_FIXED_PIXCOORDS 1"); 
 
-    if (REPAIR_STACKS)          strextend (&command, "-repair-stacks");
+    if (REPAIR_STACKS)          strextend (&command, "-repair-stacks-on-update");
     if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
 
@@ -324 +324 @@
     if (ExcludeBogus)    strextend (&command, "-exclude-bogus %f", ExcludeBogusRadius);
     
+    if (USE_ALL_IMAGES)      strextend (&command, "-use-all-images");
     if (USE_FIXED_PIXCOORDS) strextend (&command, "-D USE_FIXED_PIXCOORDS 1"); 
 
-    if (REPAIR_STACKS)          strextend (&command, "-repair-stacks");
+    if (REPAIR_STACKS)          strextend (&command, "-repair-stacks-on-update");
     if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
 

branches/czw_branch/20160809/Ohana/src/relastro/src/args.c

@@ -53 +53 @@
   }
 
+  if ((N = get_argument (argc, argv, "-repair-stacks"))) {
+    remove_argument (N, &argc, argv);
+    RELASTRO_OP = OP_REPAIR_STACKS;
+  }
+  if ((N = get_argument (argc, argv, "-repair-object-id"))) {
+    remove_argument (N, &argc, argv);
+    RELASTRO_OP = OP_REPAIR_OBJECT_ID;
+  }
+
   if ((N = get_argument (argc, argv, "-repair-warps"))) {
     remove_argument (N, &argc, argv);
@@ -59 +68 @@
 
   REPAIR_STACKS = FALSE;
-  if ((N = get_argument (argc, argv, "-repair-stacks"))) {
+  if ((N = get_argument (argc, argv, "-repair-stacks-on-update"))) {
     remove_argument (N, &argc, argv);
     REPAIR_STACKS = TRUE;
@@ -691 +700 @@
   }
 
+  if ((N = get_argument (argc, argv, "-repair-stacks"))) {
+    remove_argument (N, &argc, argv);
+    RELASTRO_OP = OP_REPAIR_STACKS;
+  }
+
+  if ((N = get_argument (argc, argv, "-repair-object-id"))) {
+    remove_argument (N, &argc, argv);
+    RELASTRO_OP = OP_REPAIR_OBJECT_ID;
+  }
+
   if ((N = get_argument (argc, argv, "-repair-warps"))) {
     remove_argument (N, &argc, argv);
@@ -697 +716 @@
 
   REPAIR_STACKS = FALSE;
-  if ((N = get_argument (argc, argv, "-repair-stacks"))) {
+  if ((N = get_argument (argc, argv, "-repair-stacks-on-update"))) {
     remove_argument (N, &argc, argv);
     REPAIR_STACKS = TRUE;

branches/czw_branch/20160809/Ohana/src/relastro/src/relastro.c

@@ -104 +104 @@
     }
 
+    case OP_REPAIR_STACKS: {
+      FITS_DB db;
+      if (!PARALLEL) {
+      
+        set_db (&db);
+        gfits_db_init (&db);
+
+        /* lock and load the image db table */
+        int status = dvo_image_lock (&db, ImageCat, 60.0, LCK_SOFT);
+        if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
+        if (db.dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db.filename);
+        if (!dvo_image_load (&db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db.filename);
+        // the raw FITS data is freed by dvo_image_load, leaving only the Image structure data
+
+        /* load regions and images based on specified sky patch (default depth) */
+        load_images (&db, skylist, FALSE, USE_ALL_IMAGES);
+      }
+
+      // iterate over catalogs to make detection coordinates consistant
+      RepairStacks (skylist, 0, NULL);
+
+      if (!PARALLEL) {
+        freeImages (db.ftable.buffer);
+        gfits_db_free (&db);
+        freeMosaics ();
+      } 
+
+      relastro_free (sky, skylist);
+      exit (0);
+    }
+
+    case OP_REPAIR_OBJECT_ID: {
+
+      // iterate over catalogs to make detection coordinates consistant
+      RepairObjectIDs (skylist, 0, NULL);
+
+      relastro_free (sky, skylist);
+      exit (0);
+    }
+
     case OP_HIGH_SPEED:
       /* high-speed is a 2pt cross-correlation process for linking moving objects (high PM) */

branches/czw_branch/20160809/Ohana/src/relastro/src/relastro_client.c

@@ -104 +104 @@
     }
 
+    case OP_REPAIR_OBJECT_ID: {
+
+      // iterate over catalogs to make detection coordinates consistant
+      RepairObjectIDs (skylist, HOST_ID, HOSTDIR);
+
+      relastro_free (sky, skylist);
+      exit (0);
+    }
+
+      // XXX loading the images is fairly costly -- see if we can do an image subset?
+    case OP_REPAIR_STACKS: {
+      FITS_DB db;
+      
+      set_db (&db);
+      gfits_db_init (&db);
+
+      /* lock and load the image db table */
+      int status = dvo_image_lock (&db, ImageCat, 60.0, LCK_SOFT);
+      if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
+      if (db.dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db.filename);
+      if (!dvo_image_load (&db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db.filename);
+      // the raw FITS data is freed by dvo_image_load, leaving only the Image structure data
+
+      /* load regions and images based on specified sky patch (default depth) */
+      load_images (&db, skylist, FALSE, USE_ALL_IMAGES);
+
+      RepairStacks (skylist, HOST_ID, HOSTDIR);
+      
+      freeImages (db.ftable.buffer);
+      gfits_db_free (&db);
+      freeMosaics ();
+
+      relastro_client_free (sky, skylist);
+      break;
+    }
+
       // XXX loading the images is fairly costly -- see if we can do an image subset?
     case OP_REPAIR_WARPS: {

branches/czw_branch/20160809/ippToPsps/jython/fits.py

@@ -5 +5 @@
 import shutil
 import hashlib
+import time 
 from subprocess import call, PIPE, Popen
 
@@ -20 +21 @@
     '''
     def __init__(self, logger, config, originalPath):
-
        # set class variables
        self.originalPath = originalPath
@@ -27 +27 @@
        self.header = None
 
+       numtries = 0
+       success = 0
+       time_wait=30
+       while (numtries < 5 and success == 0):
+           numtries = numtries +1
+           self.logger.infoPair("Attempting to read file, attempt #",str(numtries))
+           if os.path.isfile(self.originalPath):
+               success = 1
+               self.logger.infoPair("success to read file", self.originalPath)
+           else:  #if it fails, wait 30 seconds before looping
+               time.sleep(time_wait)
+               time_wait= 120 #(first time, wait 30 seconds)
+
+       if success == 0:
+           self.logger.errorPair("Cannot read file", self.originalPath)
+           return           
+
        # does this file even exist?
-       if not os.path.isfile(self.originalPath): 
-           self.logger.errorPair("Cannot read file", self.originalPath)
-           return
+       #if not os.path.isfile(self.originalPath): 
+        #   self.logger.errorPair("Cannot read file", self.originalPath)
+         #  return
+
+
 
        # ok, we have a file, now copy it locally to save on NFS overhead

branches/czw_branch/20160809/ippToPsps/jython/objectbatch.py

@@ -318 +318 @@
         sqlLine.group("decMeanErr",      "DEC_ERR")
         sqlLine.group("posMeanChisq",    "CHISQ_POS")
-        sqlLine.group("nStackObjectRows", "'0'") # XXX I need to add / define this in dvopsps
+        sqlLine.group("nStackObjectRows", "'-999'") # XXX I need to add / define this in dvopsps # HAF set to -999 as required for pv3
         sqlLine.group("nStackDetections", "'0'")
         sqlLine.group("nDetections",      "'0'")

branches/czw_branch/20160809/ippconfig/Makefile.am

@@ -22 +22 @@
         ssp \
         uh8k \
-        suprime 
+        suprime  \
+        hsc
 
 install_files = \

branches/czw_branch/20160809/ippconfig/configure.ac

@@ -34 +34 @@
   uh8k/Makefile
   suprime/Makefile
+  hsc/Makefile
 ])
 AC_OUTPUT

branches/czw_branch/20160809/ippconfig/dvo.photcodes

@@ -1551 +1551 @@
   24110 HSC.y.110            dep  25.000  0.000 0.000     -     - 0.0000     0     5   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
   24111 HSC.y.111            dep  25.000  0.000 0.000     -     - 0.0000     0     5   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+

branches/czw_branch/20160809/ippconfig/hsc/camera.config

@@ -132 +132 @@
 FILTER.ID       METADATA
    g        STR   HSC-g
+   r        MULTI
    r        STR   HSC-r
+   r        STR   HSC-r2
    i        MULTI
    i        STR   HSC-i
    i        STR   HSC-i2
    z        STR   HSC-z
+   y        STR   HSC-Y
 END
 

branches/czw_branch/20160809/ippconfig/hsc/format_mef.config

@@ -148 +148 @@
                 CELL.BIASSEC.SOURCE     STR     VALUE
                 CELL.TRIMSEC.SOURCE     STR     VALUE
-                CELL.BIASSEC            STR     [512:536,50:4225]
+                CELL.BIASSEC            STR     [521:536,50:4225]
                 CELL.TRIMSEC            STR     [9:520,50:4225]
                 CELL.GAIN.SOURCE        STR     HEADER

branches/czw_branch/20160809/ippconfig/recipes/nightly_science.config

@@ -129 +129 @@
 TARGETS METADATA
   NAME         STR  QUB
-  DISTRIBUTION STR  QUBtests
+  DISTRIBUTION STR  NODIST 
   TESS         STR  RINGS.V3
   OBSMODE      STR  QUB
@@ -137 +137 @@
   REDUCTION STR QUB_DEFAULT
   DIST           S16  15
-  CHIP           S16  3
-  WARP           S16  3
-  DIFF           S16  3
+  CHIP           S16  5 
+  WARP           S16  5 
+  DIFF           S16  5 
 END
 TARGETS METADATA
@@ -349 +349 @@
   ADDITIONAL_STACK_LABEL STR ecliptic.rp
 #  REDUCTION STR SSTF_4SIG
+END
+TARGETS METADATA
+  NAME         STR FSS
+  DISTRIBUTION STR SweetSpot
+  TESS         STR RINGS.V3
+  OBSMODE      STR FSS
+  STACKABLE   BOOL FALSE
+  DIFFABLE    BOOL FALSE
+  OFFNIGHT_DIFFS BOOL FALSE
+  REDUCTION STR SWEETSPOT
+  CHIP      S16 5
+  WARP      S16 5
+  DIFF      S16 5
 END
 TARGETS METADATA

branches/czw_branch/20160809/ippconfig/tc3/Makefile.am

@@ -7 +7 @@
         format.config     \
         format_ps2.config \
+        format_tc1.config \
         ppImage.config    \
         ppMerge.config

branches/czw_branch/20160809/psconfig/tagsets/ipp-3.0.dist

@@ -66 +66 @@
   YYYYY  ippScripts             ipp-2-9          -0
   YYYYY  ippTasks               ipp-2-9          -0
-  NNYYN  ippToPsps              ipp-2-9          -0
+  YYYYY  ippToPsps              ipp-2-9          -0
           
   YYYYY  ippconfig              ipp-2-9          -0

branches/czw_branch/20160809/tools/heather/pv3slicer/slicebatch_ST.py

@@ -40 +40 @@
 image_data [:] = image_data_decfix
     
-decmin = -55
+decmin = -35
 xmin = decmin + 90
 #print "full total", np.nansum(image_data,dtype='double')
@@ -63 +63 @@
         decmin = dec
         sumtotal = sumtotal + sumcheck
-        segsize = sumcheck/2.
+        segsize = sumcheck/4.
         jj =0
         sumtotalra = 0
@@ -87 +87 @@
                 decccmin=imin-90
                 decccmax = i-90
-                PSPS = "PSPS_PV3_OB_ra"+str(360-armax)+"to"+str(360-armin)+"dec"+str(imin-90)+"to"+str(i-90)
-                PSPS2 = "PSPS_PV3_OB_SLICE_"+str(slicecnt)
+                #PSPS = "PSPS_PV3_OB_ra"+str(360-armax)+"to"+str(360-armin)+"dec"+str(imin-90)+"to"+str(i-90)
+                PSPS2 = "PSPS_PV3_ST_SLICE_"+str(slicecnt)
                 
                 print str(ramin).ljust(5), str(ramax).ljust(5),str(decccmin).ljust(5), str(decccmax).ljust(5),PSPS2,newsumcheckra, datamachines[dmcnt]