Index: /branches/eam_branches/ipp-20120627/ippMonitor/czartool/czartool/Plotter.pm =================================================================== --- /branches/eam_branches/ipp-20120627/ippMonitor/czartool/czartool/Plotter.pm (revision 34138) +++ /branches/eam_branches/ipp-20120627/ippMonitor/czartool/czartool/Plotter.pm (revision 34139) @@ -11,25 +11,26 @@ my @allStages = ( - "chip", - "cam", - "fake", - "warp", - "stack", - "staticsky", - "diff", - "dist", + "chip", + "cam", + "fake", + "warp", + "stack", + "staticsky", + "diff", + "dist", "pub", "chipbackground"); my @allIppToPspsStages = ( - "processed", - "loaded_to_datastore", - "loaded_to_ODM", - "merge_worthy", - "deleted_datastore", - "deleted_dxlayer", - "merged", + "processed", + "loaded_to_datastore", + "loaded_to_ODM", + "merge_worthy", + "deleted_datastore", + "deleted_dxlayer", + "merged", "deleted_local"); +my $GNUPLOT="/home/panstarrs/ipp/local/bin/gnuplot"; ########################################################################### @@ -96,5 +97,5 @@ ########################################################################### # -# Sets plotter to use standard IPP mode, i.e. chip, cam etc +# Sets plotter to use standard IPP mode, i.e. chip, cam etc # ########################################################################### @@ -107,5 +108,5 @@ ########################################################################### # -# Sets plotter to use ippToPsps mode, i.e. processed, loaded_to_datastore etc +# Sets plotter to use ippToPsps mode, i.e. processed, loaded_to_datastore etc # ########################################################################### @@ -182,5 +183,5 @@ # stages - my $stages = undef; + my $stages = undef; if (!$selectedStage) { $stages = \@{$self->{allStages}}; @@ -196,5 +197,5 @@ my $stage = undef; my $gnuplotFile = undef; - my $minX = 999999999; + my $minX = 999999999; my $maxX = -9999999999; my $timeDiff = 0; @@ -203,8 +204,8 @@ if ($self->{_czarDb}->createProcessingRateData( - $stage, - $label, - $beginTime, - $endTime, + $stage, + $label, + $beginTime, + $endTime, $interval, \$gnuplotFile, @@ -233,5 +234,5 @@ my ($self, $gnuplotFiles, $outputFile, $label, $selectedStage, $beginTime, $endTime, $interval) = @_; - open (GP, "|/usr/bin/gnuplot -persist") or die "no gnuplot"; + open (GP, "|$GNUPLOT -persist") or die "no gnuplot"; use FileHandle; GP->autoflush(1); @@ -276,12 +277,12 @@ my ($self, $label, $selectedStage, $beginTime, $endTime, $linear, $log, $rate) = @_; - my $minX = 999999999; + my $minX = 999999999; my $maxX = -9999999999; my $timeDiff = 0; - my $stages = undef; + my $stages = undef; if (!$selectedStage) {$stages = \@{$self->{allStages}};} - else {$stages = ["$selectedStage"]}; + else {$stages = ["$selectedStage"]}; my %linDataFiles; @@ -296,11 +297,11 @@ if($self->{_czarDb}->createTimeSeriesData( - $label, - $stage, - $beginTime, - $endTime, - \$minX, - \$maxX, - \$timeDiff, + $label, + $stage, + $beginTime, + $endTime, + \$minX, + \$maxX, + \$timeDiff, \$linDataFile, \$logDataFile, @@ -311,5 +312,5 @@ $ratDataFiles{$stage} = $ratDataFile; } - } + } my $numOfPlots = keys(%linDataFiles); @@ -319,5 +320,5 @@ # print "Warning: No plots could be generated for stage '$selectedStage' and label '$label' during time period '$beginTime', '$endTime'\n"; return; - } + } if ($timeDiff == 0) { @@ -332,12 +333,12 @@ $self->plotTimeSeries( - \%linDataFiles, - $outputFile, - $label, - $beginTime, - $endTime, - $maxX, - $minX, - $timeDiff, + \%linDataFiles, + $outputFile, + $label, + $beginTime, + $endTime, + $maxX, + $minX, + $timeDiff, "", "Items"); @@ -349,12 +350,12 @@ $self->plotTimeSeries( - \%logDataFiles, - $outputFile, - $label, - $beginTime, - $endTime, - $maxX, - $minX, - $timeDiff, + \%logDataFiles, + $outputFile, + $label, + $beginTime, + $endTime, + $maxX, + $minX, + $timeDiff, "", "Log(Items)"); @@ -366,16 +367,16 @@ $self->plotTimeSeries( - \%ratDataFiles, - $outputFile, - $label, - $beginTime, - $endTime, - $maxX, - $minX, - $timeDiff, + \%ratDataFiles, + $outputFile, + $label, + $beginTime, + $endTime, + $maxX, + $minX, + $timeDiff, "", "Items per hour"); -} -} +} +} ########################################################################### @@ -398,13 +399,13 @@ if (!$self->{_czarDb}->countProcessedPendingAndFaults( - $label, - $stage, - $beginTime, - $endTime, - \$processed, - \$pending, + $label, + $stage, + $beginTime, + $endTime, + \$processed, + \$pending, \$faults)) {next;} - $pendingMinusFaults = $pending - $faults; + $pendingMinusFaults = $pending - $faults; print GNUDAT "$stage $faults $processed $pendingMinusFaults\n"; } @@ -412,5 +413,5 @@ close(GNUDAT); - open (GP, "|/usr/bin/gnuplot -persist") or die "no gnuplot"; + open (GP, "|$GNUPLOT -persist") or die "no gnuplot"; use FileHandle; GP->autoflush(1); @@ -427,5 +428,5 @@ "set ylabel \"Items\";" . "set boxwidth 0.75;" . - "plot '".$tmpFile->filename."' using 2:xtic(1) title \"Faults\" lt 1, '' using 3 title \"Processed\" lt 2, '' using 4 title \"Pending\" lt 7;" . + "plot '".$tmpFile->filename."' using 2:xtic(1) title \"Faults\" lt 1, '' using 3 title \"Processed\" lt 2, '' using 4 title \"Pending\" lt 7;" . "\n"; @@ -435,5 +436,5 @@ ########################################################################### # -# Sets the output path +# Sets the output path # ########################################################################### @@ -441,9 +442,9 @@ my ($self, $outputFormat) = @_; $self->{_outputFormat} = $outputFormat if defined($outputFormat); -} - -########################################################################### -# -# Sets the output type +} + +########################################################################### +# +# Sets the output type # ########################################################################### @@ -451,5 +452,5 @@ my ($self, $outputPath) = @_; $self->{_outputPath} = $outputPath if defined($outputPath); -} +} ########################################################################### @@ -462,5 +463,5 @@ $self->{_dateFormat} = $dateFormat if defined($dateFormat); return $self->{_dateFormat}; -} +} ########################################################################### @@ -543,5 +544,5 @@ $title .= " for '$label'\\nFrom '$fromTime' to '$toTime' HST"; - open (GP, "|/usr/bin/gnuplot -persist") or die "no gnuplot"; + open (GP, "|$GNUPLOT -persist") or die "no gnuplot"; use FileHandle; GP->autoflush(1); @@ -612,5 +613,5 @@ $self->getTimeSpacing($timeDiff, \$divX, \$timeFormat); - open (GP, "|/usr/bin/gnuplot -persist") or die "no gnuplot"; + open (GP, "|$GNUPLOT -persist") or die "no gnuplot"; use FileHandle; GP->autoflush(1); @@ -656,5 +657,5 @@ my $totalPercent = sprintf("%.1f%%", $totalUsed); - open (GP, "|/usr/bin/gnuplot -persist") or die "no gnuplot"; + open (GP, "|$GNUPLOT -persist") or die "no gnuplot"; use FileHandle; GP->autoflush(1); @@ -672,8 +673,8 @@ "plot '".$tmpFile->filename."' " . "using 2:xtic(1) t \"Used\" lt 7," . - "'' using 3 t \"Over $limit% used\" lt 1," . - "'' using 4 t \"Unavailable\" fs solid 0.50 lt -1 ," . - "'' using 5 t \"Free\" lt 2," . - "'' using 6 notitle fs solid 0.50 lt -1" . + "'' using 3 t \"Over $limit% used\" lt 1," . + "'' using 4 t \"Unavailable\" fs solid 0.50 lt -1 ," . + "'' using 5 t \"Free\" lt 2," . + "'' using 6 notitle fs solid 0.50 lt -1" . ";" . @@ -718,5 +719,5 @@ - open (GP, "|/usr/bin/gnuplot -persist") or die "no gnuplot"; + open (GP, "|$GNUPLOT -persist") or die "no gnuplot"; use FileHandle; GP->autoflush(1); @@ -731,6 +732,6 @@ set grid set size square - set xrange [-0.5:7.5] reverse - set yrange [-0.5:7.5] + set xrange [-0.5:7.5] reverse + set yrange [-0.5:7.5] unset key set palette rgb 22,13,10 @@ -769,5 +770,5 @@ # set up bins - my %histogram; + my %histogram; my @bins; my $interval = 0.05; @@ -812,5 +813,5 @@ my $totalMaskFrac; - + if ($totalChipCount > 0) { @@ -842,5 +843,5 @@ # make histogram - open (GP, "|/usr/bin/gnuplot -persist") or die "no gnuplot"; + open (GP, "|$GNUPLOT -persist") or die "no gnuplot"; use FileHandle; GP->autoflush(1); @@ -859,5 +860,5 @@ "set boxwidth 0.75;" . "set xtic rotate by -90 scale 0;" . - "plot '".$tmpFile->filename."' using 2:xtic(1) notitle lt 1;" . + "plot '".$tmpFile->filename."' using 2:xtic(1) notitle lt 1;" . "\n"; @@ -865,5 +866,5 @@ # make cumulative distribution - open (GP, "|/usr/bin/gnuplot -persist") or die "no gnuplot"; + open (GP, "|$GNUPLOT -persist") or die "no gnuplot"; use FileHandle; GP->autoflush(1); @@ -878,5 +879,5 @@ "set ylabel \"Number of Exposures\";" . "set xtic rotate by -90 scale 0;" . - "plot " . + "plot " . "'".$tmpFile->filename."' using 1:3 notitle with lines lt 2 lw 2\n"; Index: /branches/eam_branches/ipp-20120627/ippMonitor/raw/czartool_labels.php =================================================================== --- /branches/eam_branches/ipp-20120627/ippMonitor/raw/czartool_labels.php (revision 34138) +++ /branches/eam_branches/ipp-20120627/ippMonitor/raw/czartool_labels.php (revision 34139) @@ -170,7 +170,8 @@ echo "Cluster loadhere cpu_report"; echo "Who's using the cluster?here"; +echo "Files monitorhere"; echo "IPP metricshere"; echo "Czar log pagesAll   "; -echo "This week"; +echo "This week"; echo ""; echo "Exposure summaryhere"; Index: /branches/eam_branches/ipp-20120627/ippTools/src/pstamptool.c =================================================================== --- /branches/eam_branches/ipp-20120627/ippTools/src/pstamptool.c (revision 34138) +++ /branches/eam_branches/ipp-20120627/ippTools/src/pstamptool.c (revision 34139) @@ -49,6 +49,7 @@ static bool revertjobMode(pxConfig *config); -# if (0) +# if (1) // these are unused functions -- since they are 'static', this raises an warning +// XXX: They actually are used static bool addprojectMode(pxConfig *config); static bool projectMode(pxConfig *config); @@ -102,5 +103,5 @@ MODECASE(PSTAMPTOOL_MODE_STOPDEPENDENTJOB, stopdependentjobMode); MODECASE(PSTAMPTOOL_MODE_REVERTJOB, revertjobMode); -# if (0) +# if (1) MODECASE(PSTAMPTOOL_MODE_ADDPROJECT, addprojectMode); MODECASE(PSTAMPTOOL_MODE_MODPROJECT, modprojectMode); @@ -1101,6 +1102,7 @@ } -# if (0) +# if (1) // these are unused functions +// XXX: yes they are static bool addprojectMode(pxConfig *config) { Index: /branches/eam_branches/ipp-20120627/ippconfig/gpc1/ppStack.config =================================================================== --- /branches/eam_branches/ipp-20120627/ippconfig/gpc1/ppStack.config (revision 34138) +++ /branches/eam_branches/ipp-20120627/ippconfig/gpc1/ppStack.config (revision 34139) @@ -18,30 +18,31 @@ END -PS1_REFERENCE METADATA - OUTPUT.NOCOMP BOOL TRUE - OUTPUT.LOGFLUX BOOL FALSE - OUTPUT.REPLICATE BOOL TRUE +PS1_REFERENCE METADATA # Refstack for diffims, typically best of best IQ/images and N>20 + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE + PSF.INPUT.MAX F32 6.0 # never really want >6 pixels in refstack + PSF.INPUT.CLIP.NSIGMA F32 1.0 # sample typically on rising side of distribution (set even smaller?) END -STACK_DEEP METADATA - OUTPUT.NOCOMP BOOL TRUE - OUTPUT.LOGFLUX BOOL FALSE - - PSF.INPUT.MAX F32 7.5 - PSF.INPUT.CLIP.NSIGMA F32 5.0 +STACK_DEEP METADATA # N>>20 inputs, typically MD fields + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE + PSF.INPUT.MAX F32 7.5 + PSF.INPUT.CLIP.NSIGMA F32 1.5 END -# for just unconvolved and deep stacks -QUICKSTACK_DEEP METADATA - CONVOLVE BOOL FALSE - COMBINE.REJ F32 3.5 # Rejection threshold in combination (sigma). tune? - COMBINE.DISCARD F32 0.2 # Discard fraction for Olympic weighted mean. tune? - OUTPUT.NOCOMP BOOL TRUE - OUTPUT.LOGFLUX BOOL FALSE - PSF.INPUT.MAX F32 8.0 # since not convolved limit, relax? tune? - PSF.INPUT.CLIP.NSIGMA F32 5.0 +QUICKSTACK_DEEP METADATA # Unconvolved and deep stacks only + CONVOLVE BOOL FALSE + COMBINE.REJ F32 3.5 # Rejection threshold in combination (sigma). tune? + COMBINE.DISCARD F32 0.2 # Discard fraction for Olympic weighted mean. tune? + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + PSF.INPUT.MAX F32 7.5 # since not convolved limit, relax/tune? + PSF.INPUT.CLIP.NSIGMA F32 1.5 END -STACK_NIGHTLY METADATA +STACK_NIGHTLY METADATA # Typically MD 8 input nightly stacks OUTPUT.NOCOMP BOOL FALSE OUTPUT.LOGFLUX BOOL FALSE @@ -49,7 +50,8 @@ STACK_THREEPI METADATA - PSF.INPUT.MAX F32 12.0 - OUTPUT.NOCOMP BOOL FALSE - OUTPUT.LOGFLUX BOOL TRUE + OUTPUT.NOCOMP BOOL FALSE + OUTPUT.LOGFLUX BOOL TRUE + PSF.INPUT.MAX F32 7.5 # input cut more restrictive now 12->7.5 pix, limit target PSF in convolved stacks + PSF.INPUT.CLIP.NSIGMA F32 1.5 # additional cut if majority of inputs much smaller than INPUT.MAX END Index: /branches/eam_branches/ipp-20120627/magic/Makefile =================================================================== --- /branches/eam_branches/ipp-20120627/magic/Makefile (revision 34138) +++ /branches/eam_branches/ipp-20120627/magic/Makefile (revision 34139) @@ -60,5 +60,5 @@ ssa-core-cpp/build/libSSA.a: - if [ -d ssa-core-cpp ]; then (cd ssa-core-cpp && ./configure && make); fi + if [ -d ssa-core-cpp ]; then (cd ssa-core-cpp && ./configure --disable-doxygen && make); fi magic: magic/DetectStreaks Index: /branches/eam_branches/ipp-20120627/psLib/m4/ipp_stdopts.m4 =================================================================== --- /branches/eam_branches/ipp-20120627/psLib/m4/ipp_stdopts.m4 (revision 34138) +++ /branches/eam_branches/ipp-20120627/psLib/m4/ipp_stdopts.m4 (revision 34139) @@ -9,7 +9,5 @@ CFLAGS="-pipe -O2 -g -DPS_NO_TRACE"], [AC_MSG_RESULT([compile optimization disabled]) - if test x"${CFLAGS}" == x; then - CFLAGS="-pipe -O0 -g" - fi + CFLAGS="-pipe -O0 -g" ] ) Index: /branches/eam_branches/ipp-20120627/psconfig/tagsets/ipp-3.0.libs =================================================================== --- /branches/eam_branches/ipp-20120627/psconfig/tagsets/ipp-3.0.libs (revision 34138) +++ /branches/eam_branches/ipp-20120627/psconfig/tagsets/ipp-3.0.libs (revision 34139) @@ -35,5 +35,5 @@ lib libjpeg NONE jpeg jpegsrc.v8c.tar.gz jpeg-8c N --enable-shared NONE NONE lib libcfitsio NONE NONE cfitsio3100-p4.tar.gz cfitsio3100-p4 N --enable-shared shared,all NONE -lib libmysqlclient NONE mysql mysql-5.0.51a.tar.gz mysql-5.0.51a N NONE NONE NONE +lib libmysqlclient NONE mysql mysql-5.0.51a.tar.gz mysql-5.0.51a N --with-unix-socket-path=/var/run/mysqld/mysqld.sock NONE NONE lib libgsl NONE NONE gsl-1.11.tar.gz gsl-1.11 N NONE NONE NONE lib libfftw3f NONE NONE fftw-3.0.1.tar.gz fftw-3.0.1 N --enable-float,--enable-shared,--disable-fortran NONE NONE Index: /branches/eam_branches/ipp-20120627/tools/mysql-dump/gpc1_install.sh =================================================================== --- /branches/eam_branches/ipp-20120627/tools/mysql-dump/gpc1_install.sh (revision 34138) +++ /branches/eam_branches/ipp-20120627/tools/mysql-dump/gpc1_install.sh (revision 34139) @@ -38,5 +38,5 @@ if [ "$ITERATION" -ge "$MAX_ITERATIONS" ]; then log ERROR "Copy of $TARGET/$MD5FILE failed after $ITERATION iterations. Giving up" - email "Too many failures when attempting to copy $TARGET/$MD5FILE" $EMAILTO "Check log" + email "Too many failures when attempting to copy $TARGET/$MD5FILE" $EMAILTO "Check log /netdisks/panstarrs/ipp/mysql-dump/gpc1_install.log" log INFO "End of gpc1_install.sh (Failure)" exit 1 Index: /branches/eam_branches/ipp-20120627/tools/mysql-dump/ops_dump.csh =================================================================== --- /branches/eam_branches/ipp-20120627/tools/mysql-dump/ops_dump.csh (revision 34138) +++ /branches/eam_branches/ipp-20120627/tools/mysql-dump/ops_dump.csh (revision 34139) @@ -18,5 +18,5 @@ set DATEVAR=`date +%FT%T` #date set FILENAME = $DUMP_PATH/mysql-ippadmin-ipp001-$DATEVAR.dump.bz -mysqldump --compress -hipp001 -uipp -pipp --flush-logs --single-transaction ippadmin | bzip2 > $FILENAME +mysqldump --compress -hipp001 -uipp -pipp --single-transaction ippadmin | bzip2 > $FILENAME if ($status != 0) then /bin/mail -s "Warning ippadmin dump failed" $EMAILTO < msg