Index: /branches/Mars_MC/mjobs/MJSimulation.cc
===================================================================
--- /branches/Mars_MC/mjobs/MJSimulation.cc	(revision 17047)
+++ /branches/Mars_MC/mjobs/MJSimulation.cc	(revision 17048)
@@ -261,6 +261,8 @@
 }
 
-void MJSimulation::SetupHeaderKeys(MWriteFitsFile &write) const
+void MJSimulation::SetupHeaderKeys(MWriteFitsFile &write,MRawRunHeader &header) const
 {
+    const MTime now(-1);
+    write.SetHeaderKey("ISMC",true,"Bool if File is Montecarlo File");
     write.SetHeaderKey("TELESCOP", "FACT", "");
     write.SetHeaderKey("PACKAGE", "MARS Cheobs", "");
@@ -268,54 +270,69 @@
     write.SetHeaderKey("CREATOR", "Ceres", "");
     write.SetHeaderKey("EXTREL", 1., "");
-    write.SetHeaderKey("COMPILED", "1970-01-01T00:00:00", "");
+    write.SetHeaderKey("COMPILED", __DATE__" "__TIME__, "");
     write.SetHeaderKey("REVISION", "0", "");
     write.SetHeaderKey("ORIGIN", "FACT", "");
-    write.SetHeaderKey("DATE", "1970-01-01T00:00:00", "");
-    write.SetHeaderKey("NIGHT", 19700101, "");
+    write.SetHeaderKey("DATE", now.GetStringFmt("%Y-%m-%dT%H:%M:%S").Data(), "");
+    write.SetHeaderKey("NIGHT", now.GetNightAsInt(), "");
     write.SetHeaderKey("TIMESYS", "UTC", "");
     write.SetHeaderKey("TIMEUNIT", "d", "");
     write.SetHeaderKey("MJDREF", 40587, "");
-    write.SetHeaderKey("BLDVER", 1, "");
-    write.SetHeaderKey("RUNID", 1, "");
+    //write.SetHeaderKey("BLDVER", 1, "");
+    write.SetHeaderKey("RUNID", header.GetRunNumber(), "");
     write.SetHeaderKey("NBOARD", 40, "");
-    write.SetHeaderKey("NPIX", 1440, "");
-    write.SetHeaderKey("NROI", 150, "");
+    write.SetHeaderKey("NPIX", header.GetNumPixel(), "");
+    write.SetHeaderKey("NROI", header.GetNumSamplesHiGain(), "");
     write.SetHeaderKey("NROITM", 0, "");
     write.SetHeaderKey("TMSHIFT", 0, "");
     write.SetHeaderKey("CAMERA", "MGeomCamFACT", "");
     write.SetHeaderKey("DAQ", "DRS4", "");
-    write.SetHeaderKey("ADCRANGE", 2000, "Dynamic range in mV");
-    write.SetHeaderKey("ADC", 12, "Resolution in bits");
-    write.SetHeaderKey("RUNTYPE", "data", "");
-    write.SetHeaderKey("ID", 777, "Board  0: Board ID");
-    write.SetHeaderKey("FMVER", 532, "Board  0: Firmware Version");
-    write.SetHeaderKey("DNA", "0", "");
-    write.SetHeaderKey("BOARD", 0, "");
-    write.SetHeaderKey("PRESC", 40, "");
-    write.SetHeaderKey("PHASE", 0, "");
-    write.SetHeaderKey("DAC0", 26500, "");
-    write.SetHeaderKey("DAC1", 0, "");
-    write.SetHeaderKey("DAC2", 0, "");
-    write.SetHeaderKey("DAC3", 0, "");
-    write.SetHeaderKey("DAC4", 28800, "");
-    write.SetHeaderKey("DAC5", 28800, "");
-    write.SetHeaderKey("DAC6", 28800, "");
-    write.SetHeaderKey("DAC7", 28800, "");
-    write.SetHeaderKey("REFCLK", 2000.0768, "");
+
+    // FTemme: ADCRANGE and ADC have to be calculated, using the values for
+    // the fadctype.
+//    write.SetHeaderKey("ADCRANGE", 2000, "Dynamic range in mV");
+//    write.SetHeaderKey("ADC", 12, "Resolution in bits");
+
+    switch(header.GetRunType())
+    {
+    case MRawRunHeader::kRTData|MRawRunHeader::kRTMonteCarlo:
+        write.SetHeaderKey("RUNTYPE", "data", "");
+        break;
+    case MRawRunHeader::kRTPedestal|MRawRunHeader::kRTMonteCarlo:
+        write.SetHeaderKey("RUNTYPE", "pedestal", "");
+        break;
+    case MRawRunHeader::kRTCalibration|MRawRunHeader::kRTMonteCarlo:
+        write.SetHeaderKey("RUNTYPE", "calibration", "");
+        break;
+    }
+//    write.SetHeaderKey("ID", 777, "Board  0: Board ID");
+//    write.SetHeaderKey("FMVER", 532, "Board  0: Firmware Version");
+//    write.SetHeaderKey("DNA", "0", "");
+//    write.SetHeaderKey("BOARD", 0, "");
+//    write.SetHeaderKey("PRESC", 40, "");
+//    write.SetHeaderKey("PHASE", 0, "");
+//    write.SetHeaderKey("DAC0", 26500, "");
+//    write.SetHeaderKey("DAC1", 0, "");
+//    write.SetHeaderKey("DAC2", 0, "");
+//    write.SetHeaderKey("DAC3", 0, "");
+//    write.SetHeaderKey("DAC4", 28800, "");
+//    write.SetHeaderKey("DAC5", 28800, "");
+//    write.SetHeaderKey("DAC6", 28800, "");
+//    write.SetHeaderKey("DAC7", 28800, "");
+    write.SetHeaderKey("REFCLK", header.GetFreqSampling(), "");
     write.SetHeaderKey("DRSCALIB", false, "");
-    write.SetHeaderKey("TSTARTI", 0, "");
-    write.SetHeaderKey("TSTARTF", 0., "");
-    write.SetHeaderKey("TSTOPI", 0, "");
-    write.SetHeaderKey("TSTOPF", 0., "");
-    write.SetHeaderKey("DATE-OBS", "1970-01-01T00:00:00", "");
-    write.SetHeaderKey("DATE-END", "1970-01-01T00:00:00", "");
-    write.SetHeaderKey("NTRG", 0, "");
-    write.SetHeaderKey("NTRGPED", 0, "");
-    write.SetHeaderKey("NTRGLPE", 0, "");
-    write.SetHeaderKey("NTRGTIM", 0, "");
-    write.SetHeaderKey("NTRGLPI", 0, "");
-    write.SetHeaderKey("NTRGEXT1", 0, "");
-    write.SetHeaderKey("NTRGEXT2", 0, "");
-    write.SetHeaderKey("NTRGMISC", 0, "");
+//    write.SetHeaderKey("TSTARTI", 0, "");
+//    write.SetHeaderKey("TSTARTF", 0., "");
+//    write.SetHeaderKey("TSTOPI", 0, "");
+//    write.SetHeaderKey("TSTOPF", 0., "");
+//    write.SetHeaderKey("DATE-OBS", "1970-01-01T00:00:00", "");
+//    write.SetHeaderKey("DATE-END", "1970-01-01T00:00:00", "");
+//    write.SetHeaderKey("NTRG", 0, "");
+//    write.SetHeaderKey("NTRGPED", 0, "");
+//    write.SetHeaderKey("NTRGLPE", 0, "");
+//    write.SetHeaderKey("NTRGTIM", 0, "");
+//    write.SetHeaderKey("NTRGLPI", 0, "");
+//    write.SetHeaderKey("NTRGEXT1", 0, "");
+//    write.SetHeaderKey("NTRGEXT2", 0, "");
+//    write.SetHeaderKey("NTRGMISC", 0, "");
 }
 
@@ -326,7 +343,6 @@
     write.VetoColumn("MRawEvtData.fLoGainFadcSamples");
     write.VetoColumn("MRawEvtData.fABFlags");
-    write.VetoColumn("MRawEvtData.fIsSigned");
     write.VetoColumn("MRawEvtHeader.fNumTrigLvl2");
-    write.VetoColumn("MRawEvtHeader.fTrigPattern");
+    //write.VetoColumn("MRawEvtHeader.fTrigPattern");
     write.VetoColumn("MRawEvtHeader.fNumLoGainOn");
 }
@@ -630,5 +646,5 @@
     MTask &write3a = fWriteFitsFile ? static_cast<MTask&>(write3af) : static_cast<MTask&>(write3ar);
 
-    SetupHeaderKeys(write3af);
+    //SetupHeaderKeys(write3af,header);
     SetupVetoColumns(write3af);