Changeset 8140 for trunk/MagicSoft/Mars/mcalib

Timestamp:

10/20/06 19:26:01 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibCalcFromPast.cc (modified) (4 diffs)
• MCalibrationIntensityCam.cc (modified) (2 diffs)
• MCalibrationIntensityCam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -167 +167 @@
     fIntensConst  = (MCalibrationIntensityConstCam*) pList->FindCreateObj("MCalibrationIntensityConstCam");
 
+    if (!fIntensCharge)
+        return kFALSE;
+    if (!fIntensQE)
+        return kFALSE;
+    if (!fIntensConst)
+        return kFALSE;
+    
+
     MCalibrationChargeCam *chargeinit = (MCalibrationChargeCam*)pList->FindObject("MCalibrationChargeCam");
     MCalibrationQECam     *qeinit     = (MCalibrationQECam*)    pList->FindObject("MCalibrationQECam");
@@ -190 +198 @@
     *fLog << inf << "Found MHCalibrationChargeCam ... " << flush;
 
-    if (!fIntensCharge)
-      {
-        *fLog << err << "Could not find nor create MCalibrationIntensityChargeCam abort... " << endl;
-        return kFALSE;
-      }
-    
-    if (!fIntensQE)
-      {
-        *fLog << err << "Could not find nor create MCalibrationIntensityQECam abort... " << endl;
-        return kFALSE;
-      }
-    
     if (!fChargeCalc)
       {
@@ -388 +384 @@
   const Int_t runnumber = fRunHeader->GetRunNumber();
 
+  // The "DeleteOldCam" function must not delete the first entry in
+  // the array because it is a special cam from the MParList. (see above)
+
   if (fIntensBad)
-    {
+  {
+      *fLog << "MBadPixelsCam...";
+      MBadPixelsCam *cold = fIntensBad->GetCam();
       fIntensBad->AddToList(Form("MBadPixelsCam%04d",fNumCam),*fGeom);
-      *fLog << "MBadPixelsCam...";
-    }
+      if (cold)
+          fIntensBad->DeleteOldCam(cold);
+  }
 
   if (fIntensCharge)
-    {
+  {
+        *fLog << "MCalibrationChargeCam...";
         MCalibrationChargeCam *cold = (MCalibrationChargeCam*)fIntensCharge->GetCam();
 
@@ -404 +407 @@
 
         if (cold)
+        {
             cnew->MergeHiLoConversionFactors(*cold);
-
-      *fLog << "MCalibrationChargeCam...";
-    }
+            fIntensCharge->DeleteOldCam(cold);
+        }
+  }
+
   if (fIntensQE)
-    {
+  {
+      *fLog << "MCalibrationQECam...";
+      MCalibrationCam *cold = fIntensQE->GetCam();
       fIntensQE->AddToList(Form("MCalibrationQECam%04d",fNumCam),*fGeom);
       fIntensQE->GetCam()->SetRunNumber(runnumber);
-      *fLog << "MCalibrationQECam...";
-    }
+      if (cold)
+          fIntensQE->DeleteOldCam(cold);
+  }
   if (fIntensBlind)
-    {
+  {
+      *fLog << "MCalibrationBlindCam...";
+      MCalibrationCam *cold = fIntensBlind->GetCam();
       fIntensBlind->AddToList(Form("MCalibrationBlindCam%04d",fNumCam),*fGeom);
       fIntensBlind->GetCam()->SetRunNumber(runnumber);
-      *fLog << "MCalibrationBlindCam...";
-    }
+      if (cold)
+          fIntensBlind->DeleteOldCam(cold);
+  }
 
   *fLog << endl;

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc

@@ -289 +289 @@
 // Get camera with name 'name' 
 //
+/*
 MCalibrationCam *MCalibrationIntensityCam::GetCam(const char *name)
 {
@@ -302 +303 @@
   return static_cast<MCalibrationCam*>(fCams->FindObject(name));
 }
-
+*/
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.h

@@ -42 +42 @@
   void AddHist(const MHCalibrationCam *cam);
 
-  Int_t CountNumEntries(const MCalibrationCam::PulserColor_t col) const;  
+  Int_t CountNumEntries(const MCalibrationCam::PulserColor_t col) const;
 
   const Int_t GetSize() const  { return fCams->GetSize();  }
@@ -57 +57 @@
   const MBadPixelsPix   &GetAverageBadSector ( UInt_t i )  const   { return GetCam()->GetAverageBadSector(i); }
 
-        MCalibrationCam *GetCam              ( Int_t i=-1)       { 
-        return static_cast<MCalibrationCam*>(i==-1 ? fCams->Last() : fCams->At(i)); }
-  const MCalibrationCam *GetCam              ( Int_t i=-1) const {
-        return static_cast<MCalibrationCam*>(i==-1 ? fCams->Last() : fCams->At(i)); }
+  MCalibrationCam *GetCam              ( Int_t i/*=-1*/)       {
+      return static_cast<MCalibrationCam*>(i==-1 ? fCams->Last() : fCams->At(i)); }
+  const MCalibrationCam *GetCam              ( Int_t i/*=-1*/) const {
+      return static_cast<MCalibrationCam*>(i==-1 ? fCams->Last() : fCams->At(i)); }
 
-        MCalibrationCam *GetCam              ( const char *name );
-  const MCalibrationCam *GetCam              ( const char *name ) const;
+  MCalibrationCam *GetCam() { return static_cast<MCalibrationCam*>(fCams->Last()); }
+  const MCalibrationCam *GetCam() const { return static_cast<MCalibrationCam*>(fCams->Last()); }
+
+//        MCalibrationCam *GetCam              ( const char *name );
+//  const MCalibrationCam *GetCam              ( const char *name ) const;
+
+  // The "DeleteOldCam" function must not delete the first entry in
+  // the array because it is a special cam from the MParList. (see above)
+  void DeleteOldCam(MCalibrationCam *cam) { /* if (fCams->IndexOf(cam)>0) delete fCams->Remove(cam);*/ }
 
         MHCalibrationCam *GetHist            ( Int_t i=-1);