Changeset 4870

Timestamp:

09/06/04 11:15:43 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• macros/sql/fillcalib.C (added)
• macros/sql/filldotraw.C (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (9 diffs)
• mjobs/MJCalibrateSignal.h (modified) (2 diffs)
• mjobs/MJCalibration.cc (modified) (8 diffs)
• mjobs/MJCalibration.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/09/06: Thomas Bretz
+
+   * mjobs/MJCalibrateSignal.[h,cc]:
+     - read camera geometry from calib-file
+
+   * mjobs/MJCalibration.[h,cc]:
+     - write camera geometry to calib-file
+
+   * macros/sql/filldotraw.C, macros/sql/fillcalib.C:
+     - added
+
+   * macros/sql/filldot*.C
+     - fixed some comments
+
+
+
  2004/09/05: Markus Gaug
 
    * mcalib/MCalibColorSet.[h,cc]
      - finished setting of the asumed pulse pattern
+
 
 
@@ -59 +76 @@
      - new class derived from MCalibrationQECam which intialized the 
        cornings for the Magic camera
+
 
 

trunk/MagicSoft/Mars/macros/sql/filldotraw.C

@@ -46 +46 @@
 //
 // Remark: Running it from the commandline looks like this:
-//   root -q -l -b filldotrbk.C+\(\"path\"\,kFALSE\) 2>&1 | tee filldotrbk.log
+//   root -q -l -b filldotraw.C+\(\"filename\"\,kFALSE\) 2>&1 | tee filldotraw.log
 //
 // Make sure, that database and password are corretly set in the macro.

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -50 +50 @@
 #include "MStatusDisplay.h"
 
+#include "MGeomCam.h"
 #include "MHCamEvent.h"
 #include "MPedestalCam.h"
@@ -115 +116 @@
                                           MCalibrationCam &qecam,
                                           MCalibrationCam &tmcam,
-                                          MBadPixelsCam &badpix, MTask* &ext1, MTask* &ext2) const
+                                          MBadPixelsCam &badpix, MTask* &ext1, MTask* &ext2, TString &geom) const
 {
     const TString fname = Form("%s/calib%06d.root", fPathIn.Data(), fSequence.GetSequence());
@@ -148 +149 @@
 
     TObject *o = file.Get("ExtractSignal");
-//    if (!o)
-//    {
-//        *fLog << err << dbginf << "ERROR - Unable to read ExtractSignal from file " << fname << endl;
-//        return kFALSE;
-//    }
     if (o && !o->InheritsFrom(MExtractor::Class()))
     {
@@ -161 +157 @@
 
     o = file.Get("ExtractTime");
-//    if (!o)
-//    {
-//        *fLog << err << dbginf << "ERROR - Unable to read ExtractTime from file " << fname << endl;
-//        return kFALSE;
-//    }
     if (o && !o->InheritsFrom(MExtractor::Class()))
     {
@@ -172 +163 @@
     }
     ext2 = o ? (MTask*)o->Clone() : NULL;
-
     if (!ext1 && !ext2)
     {
@@ -178 +168 @@
         return kFALSE;
     }
+
+    o = file.Get("MGeomCam");
+    if (o && !o->InheritsFrom(MGeomCam::Class()))
+    {
+        *fLog << err << dbginf << "ERROR - MGeomCam read from " << fname << " doesn't inherit from MGeomCam!" << endl;
+        return kFALSE;
+    }
+    geom = o ? o->ClassName() : "";
 
     return kTRUE;
@@ -227 +225 @@
     MTask *extractor1=0;
     MTask *extractor2=0;
-
-    if (!ReadCalibration(calcam, qecam, tmcam, badpix, extractor1, extractor2))
+    TString geom;
+
+    if (!ReadCalibration(calcam, qecam, tmcam, badpix, extractor1, extractor2, geom))
         return kFALSE;
 
@@ -249 +248 @@
     else
         *fLog << inf << "No Time Extractor: ExtractTime in file." << endl;
+
+    if (!geom.IsNull())
+        *fLog << inf << "Camera geometry found in file: " << geom.ClassName() << endl;
+    else
+        *fLog << inf << "No Camera geometry found using default <MGeomCamMagic>" << endl;
 
     // This is necessary for the case in which it is not in the files
@@ -278 +282 @@
     //read.AddFiles(fnamein);
 
-    MGeomApply             apply; // Only necessary to craete geometry
+    MGeomApply             apply; // Only necessary to create geometry
+    if (!geom.IsNull())
+        apply.SetGeometry(geom);
     MBadPixelsMerge        merge(&badpix);
     MPedCalcFromLoGain     pedlo;

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h

@@ -10 +10 @@
 class MTask;
 class MParList;
+class MGeomCam;
 class MSequence;
 class MPedestalCam;
@@ -24 +25 @@
     Bool_t ReadCalibration(MCalibrationCam &calcam,
                            MCalibrationCam &qecam, MCalibrationCam &tmcam,
-                           MBadPixelsCam &badpix, MTask* &ext1, MTask* &ext2) const;
+                           MBadPixelsCam &badpix, MTask* &ext1, MTask* &ext2,
+                           TString &geom) const;
 
 public:

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -191 +191 @@
     : fRuns(0), fExtractor(NULL), fTimeExtractor(NULL),
       fColor(MCalibrationCam::kNONE), fDisplayType(kNormalDisplay),
-      fRelTimes(kFALSE), fDataCheck(kFALSE), fDebug(kFALSE)
+      fRelTimes(kFALSE), fDataCheck(kFALSE), fDebug(kFALSE), fGeometry("MGeomCamMagic")
 {
     fName  = name  ? name  : "MJCalibration";
@@ -1337 +1337 @@
 //   MJCalibration.UseBlindPixel: yes,no
 //   MJCalibration.UsePINDiode: yes,no
+//   MJCalibration.Geometry: MGeomCamMagic, MGeomCamECO1000
 //
 // For more details see the class description and the corresponding Getters
@@ -1360 +1361 @@
     SetUseBlindPixel(GetEnv("UseBlindPixel", IsUseBlindPixel()));
     SetUsePINDiode(GetEnv("UsePINDiode", IsUsePINDiode()));
+    SetGeometry(GetEnv("Geometry", fGeometry));
 
     return kTRUE;
@@ -1552 +1554 @@
 
     MGeomApply               apply;
+    apply.SetGeometry(fGeometry);
     MBadPixelsMerge          merge(&fBadPixels);
     MExtractPINDiode         pinext;
@@ -1682 +1685 @@
     // TOO MANY DAYS TRYING TO FIND THIS REASON!
     //
+    // There is NO BUG-REPORT! And no code has been deleted! And
+    // there is NO hint who wrote this work around and should
+    // be informed! Maybe the author of a WORKAROUND should contact
+    // the author of a class which he/she identified not working
+    // correctly instead of vice versa!
+    //
     if (fDisplay)
     {
+        /*
       if (IsUsePINDiode())
         {
@@ -1707 +1717 @@
             (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");
           cam->DrawClone(Form("nonew %s",drawoption.Data()));
-        }
+        } */
     }
 
     DisplayResult(plist);
 
-    if (!WriteResult())
+    if (!WriteResult(plist.FindObject("MGeomCam")))
         return kFALSE;
 
@@ -1862 +1872 @@
 // - MBadPixelsCam
 //
-Bool_t MJCalibration::WriteResult()
+Bool_t MJCalibration::WriteResult(TObject *geom)
 {
     if (fPathOut.IsNull())
@@ -1925 +1935 @@
     }
     *fLog << inf << "ok." << endl;
+
+    if (!geom)
+        *fLog << warn << " - WARNING: MGeomCam... not found!" << endl;
+    {
+        *fLog << inf << " - MGeomCam..." << flush;
+        if (geom->Write()<=0)
+        {
+            *fLog << err << "Unable to write MGeomCam to " << oname << endl;
+            return kFALSE;
+        }
+        *fLog << inf << "ok." << endl;
+    }
 
     if (fRelTimes)

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -100 +100 @@
   Bool_t fDataCheck;                                   // Flag if the data check is run on raw data
   Bool_t fDebug;                                       // Flag if debug option is passed onto cal. classes
+
+  TString fGeometry;
   
   void   DisplayResult        ( MParList &plist );
@@ -108 +110 @@
   void   FixDataCheckHist     ( TH1D     *hist  ) const;
   
-  Bool_t WriteResult();
+  Bool_t WriteResult(TObject *geom);
   Bool_t WriteEventloop(MEvtLoop &evtloop) const;
   Bool_t WriteTasks(MTask *t1, MTask *t2) const;
@@ -142 +144 @@
   void SetDataCheckDisplay() { fDisplayType = kDataCheckDisplay; }
   void SetNormalDisplay()    { fDisplayType = kNormalDisplay;    }
+
+  // Camera Geomtry
+  void SetGeometry(const char *geom) { fGeometry = geom; }
   
   // Rel. Time