Changeset 12740 for trunk/FACT++

Timestamp:

12/22/11 16:23:32 (13 years ago)

Author:

lyard

Message:

added special minmax for raw data

File:

• trunk/FACT++/src/fitsdump.cc (modified) (2 diffs)

trunk/FACT++/src/fitsdump.cc

@@ -630 +630 @@
 
     int row = 0;
+    long UTCvalue0=0;
+    long UTCvalue1=0;
     while (fFile->GetNextRow() && row < numRows)
     {
@@ -664 +666 @@
                     ;
             }
-            if (!fNoZeroPlease || cValue != 0)
+            if (list.size() == 1 && list[0] == "UnixTimeUTC")
             {
-                statsIt->average += cValue;
-                if (cValue < statsIt->min)
-                    statsIt->min = cValue;
-                if (cValue > statsIt->max)
-                    statsIt->max = cValue;
-                statsIt->numValues++;
+                if (i==0)
+                {
+                    UTCvalue0 = cValue;
+                }
+                else
+                {
+                    UTCvalue1 = cValue;
+                    boost::posix_time::ptime unixTimeT( boost::gregorian::date(1970, boost::gregorian::Jan, 1),
+                            boost::posix_time::seconds(UTCvalue0) +  boost::posix_time::microsec(UTCvalue1));
+
+                    Time mjdTime(unixTimeT);
+                    cValue = mjdTime.Mjd();
+                    if (!fNoZeroPlease || cValue != 0)
+                    {
+                        statsIt->average += cValue;
+                        if (cValue < statsIt->min)
+                            statsIt->min = cValue;
+                        if (cValue > statsIt->max)
+                            statsIt->max = cValue;
+                        statsIt->numValues++;
+                    }
+                }
+            }
+            else {
+                if (!fNoZeroPlease || cValue != 0)
+                {
+                    statsIt->average += cValue;
+                    if (cValue < statsIt->min)
+                        statsIt->min = cValue;
+                    if (cValue > statsIt->max)
+                        statsIt->max = cValue;
+                    statsIt->numValues++;
+                }
             }
             }