Changeset 5591

Timestamp:

Nov 23, 2005, 4:11:37 PM (21 years ago)

Author:

eugene

Message:

fixes to mana script calling

Location:

trunk/Ohana/src/shell/src

Files:

• getfocus (modified) (3 diffs)
• getseeing (modified) (1 diff)
• mkjpeg (modified) (2 diffs)
• sp_phot (modified) (1 diff)

trunk/Ohana/src/shell/src/getfocus

@@ -110 +110 @@
 rm -f $temp.pro
 set ccd = $ccdn[1]
+echo "input $script" >> $temp.pro
 echo "plotfocus $temp $temp.ppm $name $fdir/$name/$name$ccd.fits" >> $temp.pro
-mana --norc --only $script $temp.pro
+mana --norc --only $temp.pro
 if ($status) goto failure
 
@@ -138 +139 @@
  set ccdnum = $ccdn[$i]
  set ccdnam = $ccds[$i]
+ echo "input $script" >> $temp.pro
  echo "split $fdir/$name.fits $ccdnam $temp.$ccdnum.fits" >> $temp.pro
  @ i++
 end
-mana --norc --only $script $temp.pro
+mana --norc --only $temp.pro
 
 # run sextractor on each chip
@@ -164 +166 @@
 rm -f $temp.pro
 set ccd = $ccdn[1]
+echo "input $script" >> $temp.pro
 echo "plotfocus $temp $temp.ppm $name $temp.$ccd.fits" >> $temp.pro
-mana --norc --only $script $temp.pro
+mana --norc --only $temp.pro
 if ($status) goto failure
 

trunk/Ohana/src/shell/src/getseeing

@@ -71 +71 @@
  if ($Nextend != $Nccds) set tccd = $amp
  # use amp for un-spliced data, ccd for spliced
- echo "subraster.mef   $file $tccd $temp.fits $temp.stats" > $temp.pro
+ echo "input $script" > $temp.pro
+ echo "subraster.mef   $file $tccd $temp.fits $temp.stats" >> $temp.pro
 else
- echo "subraster.split $file $ccd $temp.fits $temp.stats" > $temp.pro
+ echo "input $script" > $temp.pro
+ echo "subraster.split $file $ccd $temp.fits $temp.stats" >> $temp.pro
 endif
 
 # run mana
-mana --only $script $temp.pro || goto failure;
+mana --only $temp.pro || goto failure;
 
 # run sextractor

trunk/Ohana/src/shell/src/mkjpeg

@@ -61 +61 @@
 endif
 
-echo "init.mosaic" > $temp
+echo "input $script" > $temp
+echo "init.mosaic" >> $temp
 foreach ccd (00 01 02 03 04 05 06 07 08 09 10 11)
  if ($mef) then
@@ -75 +76 @@
 echo "jpeg.mosaic $temp.jpg $temp.zoom.jpg" >> $temp
 
-mana --norc --only $script $temp
+mana --norc --only $temp
 # ppmquant 256 $temp.jpg | ppmtogif > $output
 djpeg -gif < $temp.jpg > $output

trunk/Ohana/src/shell/src/sp_phot

@@ -117 +117 @@
 
 # rsh -n $DBMACHINE addstar -skyprobe -image -cal TYCHO_V TYCHO_B $SMPDIR/$root.smp 
-addstar -skyprobe -image -cal TYCHO_V TYCHO_B $SMPDIR/$root.smp 
+addstar -skyprobe -image -cal $SMPDIR/$root.smp 
 # if ($status) goto cleanup;