Changeset 2855 for trunk/MagicSoft/Mars

Timestamp:

01/20/04 11:34:33 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/Makefile (modified) (1 diff)
• mcalib/MCalibrate.cc (modified) (1 diff)
• mcalib/Makefile (modified) (2 diffs)
• mtools/MFFT.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -7 +7 @@
  2004/01/20: Markus Gaug
   * mcalib/Makefile
+  * manalysis/Makefile
     - include directory ../mtools
  

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -25 +25 @@
            -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage   \
            -I../mhistmc -I../mfileio -I../mmain -I../mcalib          \
-           -I../mpointing
+           -I../mpointing -I../mtools
 # mcalib: MGeomApply (MCalibrationCam)
 

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -125 +125 @@
   */
 
-    const UInt_t imaxnumpix = fSignals->GetSize();
+  UInt_t numpix = fSignals->GetSize();
 
-    for (UInt_t pixidx=0; pixidx<imaxnumpix; pixidx++)
+  for (UInt_t pixid=0; pixid< numpix; pixid++)
     {
-        const MCalibrationPix &pix = (*fCalibrations)[pixidx];
+      const MCalibrationPix &pix = (*fCalibrations)[pixid];
+      
+      if (!pix.IsFitValid())
+        continue;
 
-        if (!pix.IsFitValid())
-            continue;
+      MExtractedSignalPix &sig =  (*fSignals)[pixid];
+      
+      Float_t signal;
+      Float_t signalErr = 0.;
+      
+      if (sig.IsLoGainUsed())
+        {
+          signal    = sig.GetExtractedSignalLoGain()*pix.GetConversionHiLo();
+          signalErr = signal*pix.GetConversionHiLoError();
+        }
+      else
+        {
+          signal = sig.GetExtractedSignalHiGain();
+        }
+      
+      //      Float_t calibrationConversionFactor = pix.GetMeanConversionFFactorMethod();
+      const Float_t calibrationConversionFactor      = pix.GetMeanConversionBlindPixelMethod();
+      const Float_t calibrationConversionFactorError = pix.GetErrorConversionBlindPixelMethod();
+      
+      const Float_t nphot = signal*calibrationConversionFactor;
 
-        MExtractedSignalPix &sig =  (*fSignals)[pixidx];
+      Float_t nphotErr    = signal*calibrationConversionFactorError
+                           *signal*calibrationConversionFactorError;
 
-        Float_t signal;
-        Float_t signalErr = 0.;
-
-        if (sig.IsLoGainUsed())
-        {
-            signal    = sig.GetExtractedSignalLoGain()*pix.GetConversionHiLo();
-            signalErr = signal*pix.GetConversionHiLoError();
-        }
-        else
-        {
-            signal = sig.GetExtractedSignalHiGain();
-        }
-
-        //      Float_t calibrationConversionFactor = pix.GetMeanConversionFFactorMethod();
-        const Float_t calibrationConversionFactor      = pix.GetMeanConversionBlindPixelMethod();
-        const Float_t calibrationConversionFactorError = pix.GetErrorConversionBlindPixelMethod();
-
-        const Float_t nphot = signal*calibrationConversionFactor;
-        Float_t nphotErr    = signal*calibrationConversionFactorError
-                             *signal*calibrationConversionFactorError;
-        nphotErr += signalErr*calibrationConversionFactor
-                   *signalErr*calibrationConversionFactor;
-
-        nphotErr  = TMath::Sqrt(nphotErr);
-
-
-        fCerPhotEvt->AddPixel(pixidx, nphot, nphotErr);
-
-        if (sig.GetNumLoGainSaturated() > 0)
-          (*fCerPhotEvt)[pixidx].SetPixelSaturated();
+      nphotErr += signalErr*calibrationConversionFactor
+                 *signalErr*calibrationConversionFactor;
+      
+      nphotErr  = TMath::Sqrt(nphotErr);
+      
+      fCerPhotEvt->AddPixel(pixid, nphot, nphotErr);
+      
+      if (sig.GetNumLoGainSaturated() > 0)
+        (*fCerPhotEvt)[pixid].SetPixelSaturated();
     }
-
-    fCerPhotEvt->FixSize();
-    fCerPhotEvt->SetReadyToSave();
-
-    return kTRUE;
+  
+  fCerPhotEvt->FixSize();
+  fCerPhotEvt->SetReadyToSave();
+  
+  return kTRUE;
 }

trunk/MagicSoft/Mars/mcalib/Makefile

@@ -23 +23 @@
 #
 INCLUDES = -I. -I../mbase -I../mhbase -I../mgui -I../mgeom -I../manalysis \
-           -I../mraw
+           -I../mraw -I../mtools
 # mhbase:    MBinning MH 
 # mgui:      MCamEvent (McalibrationCam)
@@ -43 +43 @@
            MHCalibrationBlindPixel.cc \
            MHCalibrationPINDiode.cc \
-           MHCalibrationPixel.cc
+           MHCalibrationPixel.cc 
 
 SRCS    = $(SRCFILES)

trunk/MagicSoft/Mars/mtools/MFFT.cc

@@ -710 +710 @@
 
       fDim = b;
-      *fLog << warn << "Dimension of Data is not a multiple of 2, will take only first " 
-            << fDim << " entries! " << endl;
+      gLog << warn << "Dimension of Data is not a multiple of 2, will take only first " 
+           << fDim << " entries! " << endl;
       return; 
     }