Changeset 8429

Timestamp:

04/20/07 15:09:30 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• CalibLinkDef.h (modified) (1 diff)
• MCalibrationTestCalc.cc (modified) (18 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

@@ -19 +19 @@
 #pragma link C++ class MCalibrationIntensityCam+;
 #pragma link C++ class MCalibrationIntensityChargeCam+;
-#pragma link C++ class MCalibrationIntensityTestCam+;
 
 #pragma link C++ class MCalibrationCam+;

trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc

@@ -64 +64 @@
 #include "MHCalibrationPix.h"
 
-#include "MCalibrationIntensityTestCam.h"
 #include "MCalibrationTestCam.h"
 #include "MCalibrationTestPix.h"
@@ -80 +79 @@
 // Default constructor. 
 //
-// Sets the pointer to fTestCam and fGeom to NULL
+// Sets the pointer to fHTestCam and fGeom to NULL
 // Sets outputpath to "."
 // Sets outputfile to "TestCalibStat.txt"
@@ -89 +88 @@
 //
 MCalibrationTestCalc::MCalibrationTestCalc(const char *name, const char *title)
-    : fBadPixels(NULL), fTestCam(NULL), fIntensCam(NULL), fCam(NULL),
-      fGeom(NULL)
+    : fBadPixels(NULL), fHTestCam(NULL), fCam(NULL), fGeom(NULL)
 {
         
@@ -109 +107 @@
 // - MGeomCam
 // - MHCalibrationTestCam
-// - MCalibrationIntensityTestCam or MCalibrationTestCam 
+// - MCalibrationTestCam
 // - MBadPixelsCam
 // 
@@ -122 +120 @@
     }
   
-  fTestCam = (MHCalibrationTestCam*)pList->FindObject("MHCalibrationTestCam");
-  if (!fTestCam)
+  fHTestCam = (MHCalibrationTestCam*)pList->FindObject("MHCalibrationTestCam");
+  if (!fHTestCam)
     {
       *fLog << err << "Cannot find MHCalibrationTestCam... aborting" << endl;
@@ -130 +128 @@
     }
 
-  fIntensCam = (MCalibrationIntensityTestCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityTestCam"));
-  if (fIntensCam)
-    *fLog << inf << "Found MCalibrationIntensityTestCam ... " << endl;
-  else
-    {
-      fCam = (MCalibrationTestCam*)pList->FindObject(AddSerialNumber("MCalibrationTestCam"));
-      if (!fCam)
-        {
-          *fLog << err << "Cannot find MCalibrationTestCam ... abort." << endl;
-          *fLog << err << "Maybe you forget to call an MFillH for the MHCalibrationTestCam before..." << endl;
-          return kFALSE;
-        }
-    }
+  fCam = (MCalibrationTestCam*)pList->FindObject(AddSerialNumber("MCalibrationTestCam"));
+  if (!fCam)
+  {
+      *fLog << err << "Cannot find MCalibrationTestCam ... abort." << endl;
+      return kFALSE;
+  }
 
   fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
@@ -166 +157 @@
     return kTRUE;
 
-  MCalibrationTestCam *testcam = fIntensCam 
-    ? (MCalibrationTestCam*)fIntensCam->GetCam()  : fCam;
-
   //
   // Re-direct the output to an ascii-file from now on:
@@ -189 +177 @@
   {
       *fLog << " Not interpolateable Pixels:";
-      *fLog << " Inner: " << Form("%3i", testcam->GetNumUninterpolated(0));
-      *fLog << " Outer: " << Form("%3i", testcam->GetNumUninterpolated(1)) << endl;
+      *fLog << " Inner: " << Form("%3i", fCam->GetNumUninterpolated(0));
+      *fLog << " Outer: " << Form("%3i", fCam->GetNumUninterpolated(1)) << endl;
       *fLog << " Biggest not-interpolateable cluster: " << maxbad << endl;
   }
 
-  testcam->SetNumUninterpolatedInMaxCluster(maxbad);
+  fCam->SetNumUninterpolatedInMaxCluster(maxbad);
 
   *fLog << endl;  
@@ -220 +208 @@
   const UInt_t nareas   = fGeom->GetNumAreas();
   const UInt_t nsectors = fGeom->GetNumSectors();
-
-  MCalibrationTestCam *testcam = fIntensCam 
-    ? (MCalibrationTestCam*)fIntensCam->GetCam()  : fCam;
 
   TArrayD lowlim      (nareas);
@@ -244 +229 @@
     {
       
-      MHCalibrationPix     &hist = (*fTestCam)[i];
-      MCalibrationTestPix  &pix =  (MCalibrationTestPix&)(*testcam)[i];
+      MHCalibrationPix     &hist = (*fHTestCam)[i];
+      MCalibrationTestPix  &pix =  (MCalibrationTestPix&)(*fCam)[i];
       //
       // We assume that the pixels have been interpolated so far. 
@@ -304 +289 @@
       const Float_t areaerr  = TMath::Sqrt(areavars[aidx]);
       
-      MCalibrationTestPix &avpix = (MCalibrationTestPix&)testcam->GetAverageArea(aidx);
+      MCalibrationTestPix &avpix = (MCalibrationTestPix&)fCam->GetAverageArea(aidx);
       avpix.SetNumPhotons   (areamean);
       avpix.SetNumPhotonsErr(areaerr );
@@ -372 +357 @@
     {
       
-      MHCalibrationPix &hist    = (*fTestCam)[i];
-      MCalibrationTestPix  &pix =  (MCalibrationTestPix&) (*testcam)[i];
+      MHCalibrationPix &hist    = (*fHTestCam)[i];
+      MCalibrationTestPix  &pix =  (MCalibrationTestPix&) (*fCam)[i];
 
       const Int_t    aidx         = (*fGeom)[i].GetAidx();
@@ -424 +409 @@
       
 
-      MCalibrationTestPix &avpix = (MCalibrationTestPix&)testcam->GetAverageArea(aidx);
+      MCalibrationTestPix &avpix = (MCalibrationTestPix&)fCam->GetAverageArea(aidx);
 
       if (areavars[aidx] < 0. || areaphotons[aidx] <= 0.)
@@ -467 +452 @@
         }
       
-      MCalibrationTestPix &avpix = (MCalibrationTestPix&)testcam->GetAverageSector(sector);
+      MCalibrationTestPix &avpix = (MCalibrationTestPix&)fCam->GetAverageSector(sector);
 
       if (sectorvars[sector] < 0. || sectorphotons[sector] <= 0.)
@@ -501 +486 @@
 {
   
-  MCalibrationTestCam *testcam = fIntensCam 
-    ? (MCalibrationTestCam*)fIntensCam->GetCam()  : fCam;
-
   const Int_t areas  = fGeom->GetNumAreas();
   TArrayI *newarr[areas];
@@ -510 +492 @@
     newarr[aidx] = new TArrayI(0);
 
-  for (Int_t i=0; i<testcam->GetSize(); i++)
+  for (Int_t i=0; i<fCam->GetSize(); i++)
     {
       const Int_t aidx = (*fGeom)[i].GetAidx();
-      MCalibrationTestPix &pix = (MCalibrationTestPix&)(*testcam)[i];
+      MCalibrationTestPix &pix = (MCalibrationTestPix&)(*fCam)[i];
       if (pix.IsExcluded())
         {
@@ -534 +516 @@
           num++;
         }
-      testcam->SetNumUninterpolated(newarr[aidx]->GetSize(),aidx);
+      fCam->SetNumUninterpolated(newarr[aidx]->GetSize(),aidx);
       *fLog << endl;
     }
@@ -545 +527 @@
 {
 
-  MCalibrationTestCam *testcam = fIntensCam 
-    ? (MCalibrationTestCam*)fIntensCam->GetCam()  : fCam;
-
   TArrayI arr(0);
   
-  for (Int_t i=0; i<testcam->GetSize(); i++)
-    {
-      MCalibrationTestPix &pix = (MCalibrationTestPix&)(*testcam)[i];
+  for (Int_t i=0; i<fCam->GetSize(); i++)
+    {
+      MCalibrationTestPix &pix = (MCalibrationTestPix&)(*fCam)[i];
       if (pix.IsExcluded())
         {

trunk/MagicSoft/Mars/mcalib/Makefile

@@ -41 +41 @@
            MCalibrationIntensityCam.cc \
            MCalibrationIntensityChargeCam.cc \
-           MCalibrationIntensityTestCam.cc \
            MCalibrationCam.cc \
            MCalibrationPix.cc  \