Changeset 14792

Timestamp:

01/28/13 10:55:44 (12 years ago)

Author:

lyard

Message:

Added fits output for MC data

Location:

trunk/Mars

Files:

• datacenter/scripts/runceres (modified) (1 diff)
• mcore/fits.h (modified) (2 diffs)
• mcore/ofits.h (modified) (1 diff)
• mfileio/FileIOLinkDef.h (modified) (1 diff)
• mfileio/MFitsArray.cc (added)
• mfileio/MFitsArray.h (added)
• mfileio/MTopFitsGroup.cc (added)
• mfileio/MTopFitsGroup.h (added)
• mfileio/MWriteFitsFile.cc (added)
• mfileio/MWriteFitsFile.h (added)
• mfileio/Makefile (modified) (1 diff)
• mjobs/MJSimulation.cc (modified) (4 diffs)
• mjobs/MJSimulation.h (modified) (2 diffs)
• mraw/MRawEvtData.h (modified) (1 diff)
• mraw/MRawEvtHeader.h (modified) (1 diff)

trunk/Mars/datacenter/scripts/runceres

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 #
 # ========================================================================

trunk/Mars/mcore/fits.h

@@ -6 +6 @@
 #define uint64_t ULong64_t
 #define uint8_t  UChar_t
+#define uint32_t UInt_t
 #else
 #include <stdint.h>
@@ -415 +416 @@
 
 #ifdef __CINT__
-    typedef map<string, void*> Pointers;
+    typedef char Pointers[56];
 #else
     typedef unordered_map<string, void*> Pointers;

trunk/Mars/mcore/ofits.h

@@ -253 +253 @@
 
         if (!entry.check())
-            return false;
-
+        {//ETIENNE
+            //looks like something went wrong. Maybe entry is too long ?
+            //try to remove the comment
+            entry.comment = "";
+            if (!entry.check())
+                return false;
+            gLog << "WARNING: removed comment from over-sized entry " << key << endl;
+        }
         fKeys.push_back(entry);
         return true;

trunk/Mars/mfileio/FileIOLinkDef.h

@@ -18 +18 @@
 #pragma link C++ class MWriteAsciiFile+;
 #pragma link C++ class MWriteRootFile+;
+#pragma link C++ class MWriteFitsFile+;
 
 #endif

trunk/Mars/mfileio/Makefile

@@ -30 +30 @@
            MWriteFile.cc \
            MWriteAsciiFile.cc \
-           MWriteRootFile.cc
+           MWriteRootFile.cc \
+           MWriteFitsFile.cc \
+           MTopFitsGroup.cc \
+           MFitsArray.cc
 
 ############################################################

trunk/Mars/mjobs/MJSimulation.cc

@@ -78 +78 @@
 #include "MImgCleanStd.h"
 #include "MWriteRootFile.h"
+#include "MWriteFitsFile.h"
 
 #include "MSimMMCS.h"
@@ -243 +244 @@
     write.AddContainer("IncidentAngle",       "Events", kFALSE);
 }
-
+//FIXME Etienne. I'm doing the same for fits and root. I probably should adapt somehow
+void MJSimulation::SetupCommonFileStructure(MWriteFitsFile& write) const
+{
+    // Common run headers
+    write.AddContainer("MMcCorsikaRunHeader", "RunHeaders", kFALSE);
+    write.AddContainer("MCorsikaRunHeader",   "RunHeaders", kFALSE);
+    write.AddContainer("MRawRunHeader",       "RunHeaders");
+    write.AddContainer("MGeomCam",            "RunHeaders");
+    write.AddContainer("MMcRunHeader",        "RunHeaders");
+
+    // Common events
+    write.AddContainer("MCorsikaEvtHeader",   "Events", kFALSE);
+    write.AddContainer("MRawEvtHeader",       "Events");
+    write.AddContainer("MMcEvt",              "Events");
+    write.AddContainer("IncidentAngle",       "Events", kFALSE);
+}
 Bool_t MJSimulation::Process(const MArgs &args, const MSequence &seq)
 {
@@ -528 +544 @@
     MWriteRootFile write4a( 2, rule4, fOverwrite?"RECREATE":"NEW", "Star file");
     MWriteRootFile write4b( 2, rule4, fOverwrite?"RECREATE":"NEW", "Star file");
-    MWriteRootFile write3a( 2, rule3, fOverwrite?"RECREATE":"NEW", "Camera file");
+    MWriteFitsFile write3a( 2, rule3, fOverwrite?"RECREATE":"NEW", "Camera file");
     MWriteRootFile write3b( 2, rule3, fOverwrite?"RECREATE":"NEW", "Camera file");
     MWriteRootFile write2a( 2, rule2, fOverwrite?"RECREATE":"NEW", "Signal file");
@@ -534 +550 @@
     MWriteRootFile write1a( 2, rule1, fOverwrite?"RECREATE":"NEW", "Reflector file");
     MWriteRootFile write1b( 2, rule1, fOverwrite?"RECREATE":"NEW", "Reflector file");
+
+    write3a.VetoColumn("MParameterD.fVal");
+    write3a.VetoColumn("MCorsikaEvtHeader.fEvtNumber");
+    write3a.VetoColumn("MCorsikaEvtHeader.fNumReuse");
+    write3a.VetoColumn("MCorsikaEvtHeader.fTotalEnergy");
+    write3a.VetoColumn("MCorsikaEvtHeader.fStartAltitude");
+    write3a.VetoColumn("MCorsikaEvtHeader.fFirstTargetNum");
+    write3a.VetoColumn("MCorsikaEvtHeader.fFirstInteractionHeight");
+    write3a.VetoColumn("MCorsikaEvtHeader.fMomentumX");
+    write3a.VetoColumn("MCorsikaEvtHeader.fMomentumY");
+    write3a.VetoColumn("MCorsikaEvtHeader.fMomentumZ");
+    write3a.VetoColumn("MCorsikaEvtHeader.fAz");
+    write3a.VetoColumn("MCorsikaEvtHeader.fWeightedNumPhotons");
+    write3a.VetoColumn("MCorsikaEvtHeader.fZd");
+    write3a.VetoColumn("MCorsikaEvtHeader.fAd");
+    write3a.VetoColumn("MCorsikaEvtHeader.fX");
+    write3a.VetoColumn("MCorsikaEvtHeader.fY");
+    write3a.VetoColumn("MCorsikaEvtHeader.fWeightNumPhotons");
+    write3a.VetoColumn("MMcEvt.fEvtNumber");
+    write3a.VetoColumn("MMcEvt.fThick0");
+    write3a.VetoColumn("MMcEvt.fFirstTarget");
+    write3a.VetoColumn("MMcEvt.fZFirstInteraction");
+    write3a.VetoColumn("MMcEvt.fCoreD");
+    write3a.VetoColumn("MMcEvt.fCoreX");
+    write3a.VetoColumn("MMcEvt.fCoreY");
+    write3a.VetoColumn("MMcEvt.fTimeFirst");
+    write3a.VetoColumn("MMcEvt.fTimeLast");
+    write3a.VetoColumn("MMcEvt.fLongiNmax");
+    write3a.VetoColumn("MMcEvt.fLongit0");
+    write3a.VetoColumn("MMcEvt.fLongitmax");
+    write3a.VetoColumn("MMcEvt.fLongia");
+    write3a.VetoColumn("MMcEvt.fLongib");
+    write3a.VetoColumn("MMcEvt.fLongic");
+    write3a.VetoColumn("MMcEvt.fLongichi2");
+    write3a.VetoColumn("MMcEvt.fPhotIni");
+    write3a.VetoColumn("MMcEvt.fPassPhotAtm");
+    write3a.VetoColumn("MMcEvt.fPassPhotRef");
+    write3a.VetoColumn("MMcEvt.fPassPhotCone");
+    write3a.VetoColumn("MMcEvt.fPhotElfromShower");
+    write3a.VetoColumn("MMcEvt.fPhotElinCamera");
+    write3a.VetoColumn("MMcEvt.fElecCphFraction");
+    write3a.VetoColumn("MMcEvt.fMuonCphFraction");
+    write3a.VetoColumn("MMcEvt.fOtherCphFraction");
+    write3a.VetoColumn("MMcEvt.fFadcTimeJitter");
+    write3a.VetoColumn("MMcEvt.fEventReuse");
+    write3a.VetoColumn("MRawEvtData.fHiGainPixId");
+//    write3a.VetoColumn("MRawEvtData.fHiGainFadcSamples");
+    write3a.VetoColumn("MRawEvtData.fLoGainPixId");
+    write3a.VetoColumn("MRawEvtData.fLoGainFadcSamples");
+    write3a.VetoColumn("MRawEvtData.fABFlags");
+    write3a.VetoColumn("MRawEvtData.fStartCells");
+    write3a.VetoColumn("MRawEvtData.fNumBytesPerSample");
+    write3a.VetoColumn("MRawEvtData.fIsSigned");
+//    write3a.VetoColumn("MRawEvtHeader.fDAQEvtNumber"); //EventNum ?
+    write3a.VetoColumn("MRawEvtHeader.fNumTrigLvl1");
+    write3a.VetoColumn("MRawEvtHeader.fNumTrigLvl2");
+    write3a.VetoColumn("MRawEvtHeader.fTrigPattern");
+    write3a.VetoColumn("MRawEvtHeader.fNumLoGainOn");
+
+    write3a.SetBytesPerSample("Data", 2);
 
     write1a.SetName("WriteRefData");

trunk/Mars/mjobs/MJSimulation.h

@@ -11 +11 @@
 class MSequence;
 class MWriteRootFile;
+class MWriteFitsFile;
 
 class MJSimulation : public MJob
@@ -31 +32 @@
     void SetupHist(MHn &hist) const;
     void SetupCommonFileStructure(MWriteRootFile &write) const;
+    void SetupCommonFileStructure(MWriteFitsFile& write) const;
 
 public:

trunk/Mars/mraw/MRawEvtData.h

@@ -30 +30 @@
 
     MArrayS *fHiGainPixId;        //-> list of pixel IDs of hi gain channel
-    MArrayB *fHiGainFadcSamples;  //-> list of hi gain samples of all pixels (ordering: see fHiGainPixId)
+    MArrayB *fHiGainFadcSamples;  //-> list of hi gain samples of all pixels (ordering: see fHiGainPixId) [fits: unit=mV ; name = Data]
 
     MArrayS *fLoGainPixId;        //-> list of pixel IDs of lo gain channel

trunk/Mars/mraw/MRawEvtHeader.h

@@ -53 +53 @@
     MTime   *fTime;            //! object to store the time in (ReadEvt)
 
-    UInt_t   fDAQEvtNumber;    // Number of Event
+    UInt_t   fDAQEvtNumber;    // Number of Event [fits: name=EventNum]
 
     UInt_t   fNumTrigLvl1;     // Number of 1st level tiggers between 2 events