Changeset 2653 for trunk/MagicSoft

Timestamp:

12/11/03 16:27:08 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mfileio/MCT1ReadPreProc.cc (modified) (3 diffs)
• mraw/MRawRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -5 +5 @@
                                                  -*-*- END OF LINE -*-*-
  
-2003/12/11: Sebastian Raducci & Villi Scalzotto
+ 2003/12/11: Sebastian Raducci & Villi Scalzotto
+
    * manalysis/MArrivalTime.[h,cc]
-        - Added (new container)
-        - Preliminary version: do not use it
+     - Added (new container)
+     - Preliminary version: do not use it
 
    * manalysis/MArrivalTimeCalc.[h,cc]
-        - Added (new task)
+     - Added (new task)
 
    * mraw/MRawEvtPixelIter.[h,cc]
-        - Added new method GetIdxMaxHiLoGainSample()
+     - Added new method GetIdxMaxHiLoGainSample()
    
    * mraw/MRawEvtData.cc
-        - Added new case in GetPixelContent() method 
+     - Added new case in GetPixelContent() method 
 
    * mmain/MEventDisplay.cc
-        - Added new tab in the camera event display to show the
-          arrival time.
-
-2003/12/11: Abelardo Moralejo
+     - Added new tab in the camera event display to show the arrival
+       time.
+
+
+
+ 2003/12/11: Abelardo Moralejo
+
    * manalysis/MGeomApply.cc
-        - Initialize size of the MCalibrationCam object according to 
-          camera geometry.
+     - Initialize size of the MCalibrationCam object according to 
+       camera geometry.
+
+
 
  2003/12/11: Markus Gaug
+
    * manalysis/MExtractSignal, MExtractedSignalPix
-        - Store number of used FADC slices (HIGain, LoGAin)
-        - calculate signal with only 6 most significant slices (2 before, 4 after the maximum)
+     - Store number of used FADC slices (HIGain, LoGAin)
+     - calculate signal with only 6 most significant slices (2 before, 
+       4 after the maximum)
 
    * mhist/MHCalibrationBlindPixel:
-        - do the consistency check fitting the pedestal
+     - do the consistency check fitting the pedestal
 
    * mhist/MHCalibrationPixel:
-        - store Hi Gain vs. Lo Gain values to extract the conversion factor
+     - store Hi Gain vs. Lo Gain values to extract the conversion
+       factor
 
    * manalysis/MCalibrationPix:
    * manalysis/MCalibrationCam:
-        - separate Hi Gain and Lo Gain
-        - include return of PIN Diode measurement
+     - separate Hi Gain and Lo Gain
+     - include return of PIN Diode measurement
+
+
 
  2003/12/11: Thomas Bretz
@@ -50 +61 @@
      - added ReadBinary
      
-   * mraw/MRawCrateData.[h,c], mraw/MRawFileRead.[h,cc], 
-     mraw/MRawRunHeader.[h,cc], mraw/MRawSocketRead.cc:
+   * mraw/MRawCrateData.[h,c], mraw/MRawFileRead.cc, 
+     mraw/MRawEvtData.[h,cc], mraw/MRawEvtPixelIter.[h,cc],
+     mraw/MRawRunHeader.[h,cc], mraw/MRawSocketRead.cc,
+     mraw/MRawCrateArray.[h,cc]:
      - adapted to new DAQ file format Version 2
      - changed ClassDef version accordingly
 
+   * mraw/RawIncl.h:
+     - added TArrayC
+
+   * mfileio/MCT1ReadPreProc.cc:
+     - tried to change reading CT1 data accordingly
+
 
 
@@ -81 +100 @@
      
    * mreport/MReportFileRead.[h,cc]:
-     - replaced non working ReadLine by ReadToDelim (reason unknown!)
      - added SetHasNoHeader and kHasNoHeader
 

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -333 +333 @@
     *fLog << (outpars.irunduration_secs/60)%60 << "m";
     *fLog << outpars.irunduration_secs%60 << "s" << endl;
-    fRawRunHeader->SetMJD(outpars.istart_mjdate_day);
+    fRawRunHeader->SetRunTime(outpars.istart_mjdate_day, outpars.iend_mjdate_day);
     fRawRunHeader->SetReadyToSave();
 
@@ -443 +443 @@
            &fpreprocversion,    &structversion,
            &outpars.itelescope, &outpars.irunnum,
-           &dummy/*&outpars.eruntype*/,   &outpars.iproc_mjdate);
+           &dummy/*&outpars.eruntype*/, &outpars.iproc_mjdate);
 
     if (fpreprocversion<0.6)
@@ -905 +905 @@
     //  int   isecs_since_midday; // seconds passed since midday before sunset (JD of run start)
     //  int   isecfrac_200ns;     // fractional part of isecs_since_midday
-    fTime->SetCT1Time((UInt_t)fRawRunHeader->GetMJD(), event.isecfrac_200ns, event.isecs_since_midday);
+    fTime->SetCT1Time((UInt_t)fRawRunHeader->GetRunStart().GetMjd(), event.isecfrac_200ns, event.isecs_since_midday);
     fTime->SetReadyToSave();
 

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -70 +70 @@
     void SetNumCrates(UShort_t a)         { fNumCrates=a; }
     void SetNumPixInCrate(UShort_t a)     { fNumPixInCrate=a; }
+    void SetRunTime(Float_t start, Float_t stop)
+    { fRunStart.SetMjd(start); fRunStop.SetMjd(stop); }
 
     // This is to get the numbers...