Changeset 19688 for trunk

Timestamp:

09/27/19 16:40:42 (5 years ago)

Author:

tbretz

Message:

Propagate name of camera geometry to the header

Location:

trunk/Mars/mfileio

Files:

• MWriteFitsFile.cc (modified) (3 diffs)
• MWriteFitsFile.h (modified) (4 diffs)

trunk/Mars/mfileio/MWriteFitsFile.cc

@@ -344 +344 @@
 }
 
-void MWriteFitsFile::SetupHeaderKeys(MRawRunHeader &header)
+void MWriteFitsFile::SetupHeaderKeys(MRawRunHeader &header, const char *geometry)
 {
     const MTime now(-1);
@@ -368 +368 @@
     SetHeaderKey("NROITM", 0, "");
     SetHeaderKey("TMSHIFT", 0, "");
-    SetHeaderKey("CAMERA", "MGeomCamFACT", "Montecarlo File");
+    SetHeaderKey("CAMERA", geometry, "Montecarlo File");
     SetHeaderKey("DAQ", "DRS4", "Montecarlo File");
 
     // FTemme: ADCRANGE and ADC have to be calculated, using the values for
     // the fadctype.
-//    SetHeaderKey("ADCRANGE", 2000, "Dynamic range in mV");
-//    SetHeaderKey("ADC", 12, "Resolution in bits");
+    SetHeaderKey("ADCRANGE", 2000, "Dynamic range in mV");
+    SetHeaderKey("ADC", UShort_t(header.GetFadcResolution()), "Resolution in bits");
 
     switch(header.GetRunType())
@@ -1234 +1234 @@
 
    MRawRunHeader* header = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
-   SetupHeaderKeys(*header);
+   SetupHeaderKeys(*header, fGeometry);
 
    if (GetContainer(pList) == kFALSE)

trunk/Mars/mfileio/MWriteFitsFile.h

@@ -116 +116 @@
    TString fGroupName;  // name of top level group
    TString fTitle;      // title of top level group
+
+   TString fGeometry;
 
    void OpenTopLevelGroup(const char * fname);
@@ -150 +152 @@
    Int_t       PostProcess();
 
-   void        SetupHeaderKeys(MRawRunHeader &header);
+   void        SetupHeaderKeys(MRawRunHeader &header, const char *geometry);
 
 public:
@@ -164 +166 @@
            typeName == "x" || typeName == "y")   //long long
            returnVal << value;
-
        if (typeName == "b")
        {
@@ -267 +268 @@
    }
 
+   void SetGeometry(const TString &geom) { fGeometry = geom; }
+
    ClassDef(MWriteFitsFile, 0)   
 };