Changeset 6077 for trunk

Timestamp:

01/28/05 10:52:54 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibCalcFromPast.cc (modified) (1 diff)
• mcalib/MCalibrateData.cc (modified) (12 diffs)
• mcalib/MCalibrateData.h (modified) (4 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -65 +65 @@
      - fill MCalibConstCam with update results (once per calib. consts
        update == every 10 sec.)
+
+   * mjobs/MJCalibrateSignal.cc:
+     - display one MHCamera more with changing conv. factors (only for
+       interlaced cal. events)
 
 

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -244 +244 @@
     fRelTimeCalc->Finalize();
   if (fCalibrate)
-    {
-      fCalibrate->SetCalibUpdate((MCalibrationChargeCam*)fIntensCharge->GetCam());
-      fCalibrate->UpdateConversionFactors();
-    }
+    fCalibrate->UpdateConversionFactors((MCalibrationChargeCam*)fIntensCharge->GetCam());
 
   ReInitialize();

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -117 +117 @@
 #include "MCalibrationQEPix.h"
 
+#include "MCalibConstCam.h"
+#include "MCalibConstPix.h"
+
 #include "MExtractedSignalCam.h"
 #include "MExtractedSignalPix.h"
@@ -143 +146 @@
 //
 MCalibrateData::MCalibrateData(CalibrationMode_t calmode,const char *name, const char *title) 
-    : fGeomCam(NULL),   fBadPixels(NULL), fCalibrations(NULL), fCalibUpdate(NULL),
-      fQEs(NULL), fSignals(NULL), fCerPhotEvt(NULL), 
+    : fGeomCam(NULL),   fBadPixels(NULL), fCalibrations(NULL), 
+      fQEs(NULL), fSignals(NULL), fCerPhotEvt(NULL), fCalibConstCam(NULL),
       fPedestalFlag(kNo), fSignalType(kPhot), fRenormFactor(1.)
 {
@@ -213 +216 @@
         if (!fCerPhotEvt)
             return kFALSE;
+
+        fCalibConstCam = (MCalibConstCam*)pList->FindCreateObj(AddSerialNumber("MCalibConstCam"));
+        if (!fCalibConstCam)
+            return kFALSE;
     }
 
@@ -233 +240 @@
         }
 
-        SetCalibUpdate( fCalibrations );
     }
 
@@ -435 +441 @@
 // have been updated...
 //
-Bool_t MCalibrateData::UpdateConversionFactors()
+Bool_t MCalibrateData::UpdateConversionFactors( const MCalibrationChargeCam *updatecam)
 {
 
@@ -467 +473 @@
         Float_t calibUpdate   = 1.;
 
+        MCalibConstPix &cpix  = (*fCalibConstCam)[pixidx];
+            
         if(fCalibrationMode!=kNone)
           {
@@ -487 +495 @@
             MCalibrationQEPix &qe = (MCalibrationQEPix&) (*fQEs)[pixidx];
 
-            if (fCalibUpdate)
+            if (updatecam)
               {
-                MCalibrationChargePix &upix = (MCalibrationChargePix&)(*fCalibUpdate)[pixidx];
+                MCalibrationChargePix &upix = (MCalibrationChargePix&)(*updatecam)[pixidx];
                 //
                 // Correct for the possible change in amplification of the individual pixels chain
@@ -498 +506 @@
                 // Correct for global shifts in light emission
                 // 
-                MCalibrationChargePix &ugpix = (MCalibrationChargePix&)fCalibUpdate->GetAverageArea(0);
-                //  MBadPixelsPix         &ubad  = (MBadPixelsPix&)        fCalibUpdate->GetAverageBadArea(0);
+                MCalibrationChargePix &ugpix = (MCalibrationChargePix&)updatecam->GetAverageArea(0);
+                //  MBadPixelsPix         &ubad  = (MBadPixelsPix&)        updatecam->GetAverageBadArea(0);
                 //  if (ubad.IsUnsuitable())
                 //    *fLog << err << "Average Area is unsuitable!!!!" << endl;
@@ -588 +596 @@
           }
 
-        calibConv *= fRenormFactor * calibUpdate;
+        calibConv    *= fRenormFactor * calibUpdate;
+        calibFFactor *= TMath::Sqrt(fRenormFactor);
 
         fHiLoConv     [pixidx] = hiloconv;
@@ -595 +604 @@
         fCalibFFactors[pixidx] = calibFFactor;
 
+        cpix.SetCalibConst(calibConv);
+        cpix.SetCalibFFactor(calibFFactor);
+
       } /*     for (Int_t pixidx=0; pixidx<fGeomCam->GetNumPixels(); pixidx++) */
     
@@ -603 +615 @@
         return kFALSE;
     }
+
+    
 
     //    Print();
@@ -824 +838 @@
 }
 
-//----------------------------------------------------------------------------------------------------
-//
-Bool_t MCalibrateData::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
-{
-
-  if (idx > GetSize())
-    return kFALSE;
-
-  switch (type)
-    {
-    case 0:
-      val = fCalibConsts[idx];
-      break;
-    default:
-      return kFALSE;
-    }
-
-  return val!=0.;
-}
-
-
-// --------------------------------------------------------------------------
-//
-//
-void MCalibrateData::DrawPixelContent(Int_t idx) const
-{
-  *fLog << warn << "DrawPixelContent not available in" << GetDescriptor() << endl;
-}
-

trunk/MagicSoft/Mars/mcalib/MCalibrateData.h

@@ -25 +25 @@
 #endif
 
-#ifndef MARS_MCamEvent
-#include "MCamEvent.h"
-#endif
-
 class MGeomCam;
 class MBadPixelsCam;
@@ -38 +34 @@
 class MPedPhotCam;
 class MCerPhotEvt;
-
-class MCalibrateData : public MTask, public MCamEvent
+class MCalibConstCam;
+class MCalibrateData : public MTask
 {
 private:
@@ -46 +42 @@
   MBadPixelsCam         *fBadPixels;     //! Bad Pixels information
   MCalibrationChargeCam *fCalibrations;  //! Calibration constants
-  MCalibrationChargeCam *fCalibUpdate;   //! Calibration constants update (for interlaced cal events)
   MCalibrationQECam     *fQEs;           //! Quantum efficiencies
   MExtractedSignalCam   *fSignals;       //! Integrated charge in FADCs counts
   MCerPhotEvt           *fCerPhotEvt;    //! Cerenkov Photon Event used for calculation
+  MCalibConstCam        *fCalibConstCam; //! Temporary calib consts storage
   
   UShort_t fCalibrationMode;             // Flag defining the calibration mode (CalibrationMode_t)
@@ -121 +117 @@
   void   SetSignalType      ( SignalType_t      sigtype=kPhot    ) { fSignalType     =sigtype; }  
 
-  void   SetCalibUpdate     ( MCalibrationChargeCam *cam=NULL )    { fCalibUpdate    = cam;  }
+  Bool_t UpdateConversionFactors( const MCalibrationChargeCam *updatecam=NULL);
 
-  Bool_t UpdateConversionFactors();
-
-  Bool_t GetPixelContent    ( Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0 ) const;
-  void DrawPixelContent( Int_t num) const;
-  
-  ClassDef(MCalibrateData, 1)   // Task to calibrate FADC counts into Cherenkov photons 
+  ClassDef(MCalibrateData, 1)   // Task to calibrate FADC counts into photons or photo-electrons
 };
 

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -572 +572 @@
     MFillH fill6(&evt6, "MBadPixelsCam",          "FillUnsuitable");
     MFillH fill7(&evt7, "MArrivalTime",           "FillTimes");
-    MFillH fill8(&evt8, "MCalibrateData",         "FillConv");
+    MFillH fill8(&evt8, "MCalibConstCam",         "FillConv");
 
     MTaskEnv fillflorian("FinalFantasy");
@@ -699 +699 @@
       tlist2.AddToList(&pextr);
     tlist.AddToList(&tlist2, IsRootData() ? "Events" : "All");
-    //    if (fIsInterlaced)
-    //    tlist.AddToList(&fill8);
+    if (fIsInterlaced)
+      tlist.AddToList(&fill8);
 
     if (IsMC())