Index: /trunk/Ohana/src/perl/src/grab.keywords
===================================================================
--- /trunk/Ohana/src/perl/src/grab.keywords	(revision 112)
+++ /trunk/Ohana/src/perl/src/grab.keywords	(revision 113)
@@ -106,8 +106,8 @@
     $cd21 = $cd1*$pc21;
     $cd22 = $cd2*$pc22;
-    $line = sprintf "CD1_1   = %20G / WCS Coordinate scale matrix                   \n", $cd11; @astrom = (@astrom, $line);
-    $line = sprintf "CD1_2   = %20G / WCS Coordinate scale matrix                   \n", $cd12; @astrom = (@astrom, $line);
-    $line = sprintf "CD2_1   = %20G / WCS Coordinate scale matrix                   \n", $cd21; @astrom = (@astrom, $line);
-    $line = sprintf "CD2_2   = %20G / WCS Coordinate scale matrix                   \n", $cd22; @astrom = (@astrom, $line);
+    $line = sprintf "CD1_1   = %20.5E / WCS Coordinate scale matrix                   \n", $cd11; @astrom = (@astrom, $line);
+    $line = sprintf "CD1_2   = %20.5E / WCS Coordinate scale matrix                   \n", $cd12; @astrom = (@astrom, $line);
+    $line = sprintf "CD2_1   = %20.5E / WCS Coordinate scale matrix                   \n", $cd21; @astrom = (@astrom, $line);
+    $line = sprintf "CD2_2   = %20.5E / WCS Coordinate scale matrix                   \n", $cd22; @astrom = (@astrom, $line);
 }
 
@@ -135,11 +135,11 @@
     # parse the photometry data line
     @words = split (" ", $photlist[$Nphot-1]);
-    $line = sprintf "PHOT_C  = %20G / Nightly zero point - actual                   \n", $words[2];  @photom = (@photom, $line);
-    $line = sprintf "PHOT_C0 = %20G / Nightly zero point - nominal                  \n", $words[3];  @photom = (@photom, $line);
-    $line = sprintf "PHOT_CS = %20G / Nightly zero point - scatter                  \n", $words[4];  @photom = (@photom, $line);
+    $line = sprintf "PHOT_C  = %20.4F / Nightly zero point - actual                   \n", $words[2];  @photom = (@photom, $line);
+    $line = sprintf "PHOT_C0 = %20.4F / Nightly zero point - nominal                  \n", $words[3];  @photom = (@photom, $line);
+    $line = sprintf "PHOT_CS = %20.4F / Nightly zero point - scatter                  \n", $words[4];  @photom = (@photom, $line);
     $line = sprintf "PHOT_NS = %20d / Nightly zero point - N stars                  \n", $words[5];  @photom = (@photom, $line);
     $line = sprintf "PHOT_NM = %20d / Nightly zero point - N images                 \n", $words[6];  @photom = (@photom, $line);
-    $line = sprintf "PHOT_X  = %20G / Nightly zero point - color term               \n", $words[7];  @photom = (@photom, $line);
-    $line = sprintf "PHOT_K  = %20G / Nightly zero point - airmass term             \n", $words[8];  @photom = (@photom, $line);
+    $line = sprintf "PHOT_X  = %20.4F / Nightly zero point - color term             \n", $words[7];  @photom = (@photom, $line);
+    $line = sprintf "PHOT_K  = %20.4F / Nightly zero point - airmass term             \n", $words[8];  @photom = (@photom, $line);
     $line = sprintf "PHOT_C1 = '%-18s' / Nightly zero point - color 1               \n", $words[9];  @photom = (@photom, $line);
     $line = sprintf "PHOT_C2 = '%-18s' / Nightly zero point - color 2               \n", $words[10]; @photom = (@photom, $line);
@@ -172,13 +172,19 @@
 # add generic Elixir comments:
 
-$now = localtime;
+@time = localtime;
+$now = sprintf "%04d-%02d-%02dT%02d:%02d:%02d", $time[5]+1900, $time[4]+1, $time[3], $time[2], $time[1], $time[0];
+$elsys = `gconfig ELIXIR_VERSION`; chop ($elsys);
+# $frpts  = `detsearch -quiet -image $infile $ccds[$ccd] split -type frpts`; chop $frpts;
+
 @comment = ();
-$line = sprintf "COMMENT  --------------- Elixir Analysis ---------------               \n"; @comment = (@comment, $line);
-$line = sprintf "COMMENT  Elixir: processing performed \@ CFHT, version $version         \n"; @comment = (@comment, $line);
-$line = sprintf "COMMENT  Elixir: version: $version                                      \n"; @comment = (@comment, $line);
+$line = sprintf "COMMENT  --------------- Elixir Analysis ---------------                \n"; @comment = (@comment, $line);
+$line = sprintf "COMMENT  Elixir: processing performed \@ CFHT, version $elsys           \n"; @comment = (@comment, $line);
+$line = sprintf "COMMENT  Elixir: version: $elsys                                        \n"; @comment = (@comment, $line);
 $line = sprintf "COMMENT  Elixir: processing date: $now                                  \n"; @comment = (@comment, $line);
 $line = sprintf "COMMENT  Elixir: website: http://www.cfht.hawaii.edu/Instruments/Elixir \n"; @comment = (@comment, $line);
 $line = sprintf "COMMENT  Elixir: email: elixir\@cfht.hawaii.edu                         \n"; @comment = (@comment, $line);
 $line = sprintf "COMMENT  Elixir: team: Eugene Magnier & Jean-Charles Cuillandre         \n"; @comment = (@comment, $line);
+$line = sprintf "DATEPROC= '$now' / Processing Date                                      \n"; @comment = (@comment, $line);
+$line = sprintf "EL_SYS  = '%-18s' / Elixir System Version                               \n", "$elsys"; @comment = (@comment, $line);
 # (line < 80)    12345678901234567890123456789012345678901234567890123456789012345678901234567890