Changeset 14023 for trunk

Timestamp:

06/01/12 16:06:28 (12 years ago)

Author:

tbretz

Message:

Moved the creation of the default keys to a static function so that it can be accessed from the outside, too.

Location:

trunk/FACT++/src

Files:

• DataWriteFits2.cc (modified) (2 diffs)
• DataWriteFits2.h (modified) (1 diff)

trunk/FACT++/src/DataWriteFits2.cc

@@ -5 +5 @@
 
 using namespace std;
+
+void DataWriteFits2::WriteDefaultKeys(ofits &file)
+{
+    const Time now;
+    file.SetStr(  "TELESCOP", "FACT",               "Telescope that acquired this data");
+    file.SetStr(  "PACKAGE",   PACKAGE_NAME,        "Package name");
+    file.SetStr(  "VERSION",   PACKAGE_VERSION,     "Package description");
+    file.SetStr(  "CREATOR",   "fadctrl",           "Program that wrote this file");
+    file.SetFloat("EXTREL",    1.0,                 "Release Number");
+    file.SetStr(  "COMPILED",  __DATE__" "__TIME__, "Compile time");
+    file.SetStr(  "REVISION",  REVISION,            "SVN revision");
+    file.SetStr(  "ORIGIN",   "FACT",               "Institution that wrote the file");
+    file.SetStr(  "DATE",     now.Iso(),            "File creation date");
+    file.SetInt(  "NIGHT",    now.NightAsInt(),     "Night as int");
+    file.SetStr(  "TIMESYS",  "UTC",                "Time system");
+    file.SetStr(  "TIMEUNIT", "d",                  "Time given in days w.r.t. to MJDREF");
+    file.SetInt(  "MJDREF",   40587,                "MJD to UNIX time (seconds since 1970/1/1)");
+}
 
 void DataWriteFits2::WriteHeader(const RUN_HEAD* h, const FAD::RunDescription &d)
@@ -32 +50 @@
     }
 
-    // =============== Default keys from all files ===============
-    const Time now;
-    fFile.SetStr(  "TELESCOP", "FACT",               "Telescope that acquired this data");
-    fFile.SetStr(  "PACKAGE",   PACKAGE_NAME,        "Package name");
-    fFile.SetStr(  "VERSION",   PACKAGE_VERSION,     "Package description");
-    fFile.SetStr(  "CREATOR",   "fadctrl",           "Program that wrote this file");
-    fFile.SetFloat("EXTREL",    1.0,                 "Release Number");
-    fFile.SetStr(  "COMPILED",  __DATE__" "__TIME__, "Compile time");
-    fFile.SetStr(  "REVISION",  REVISION,            "SVN revision");
-    fFile.SetStr(  "ORIGIN",   "FACT",               "Institution that wrote the file");
-    fFile.SetStr(  "DATE",     now.Iso(),            "File creation date");
-    fFile.SetInt(  "NIGHT",    now.NightAsInt(),     "Night as int");
-    fFile.SetStr(  "TIMESYS",  "UTC",                "Time system");
-    fFile.SetStr(  "TIMEUNIT", "d",                  "Time given in days w.r.t. to MJDREF");
-    fFile.SetInt(  "MJDREF",   40587,                "MJD to UNIX time (seconds since 1970/1/1)");
-    //WriteKey("CONTACT",   PACKAGE_BUGREPORT, "Current package maintainer");
-    //WriteKey("URL",       PACKAGE_URL, "Current repositiory location");
+    // =============== Default keys for all files ================
+    WriteDefaultKeys(fFile);
 
     // ================ Header keys for raw-data =================

trunk/FACT++/src/DataWriteFits2.h

@@ -30 +30 @@
     bool WriteEvt(EVENT *e);
     bool Close(RUN_TAIL *rt = 0);
+
+    static void WriteDefaultKeys(std::ofits &file);
 };