Changeset 2876 for trunk/MagicSoft

Timestamp:

01/21/04 18:52:05 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• manalysis/MMcCalibrationUpdate.cc (modified) (3 diffs)
• manalysis/MMcCalibrationUpdate.h (modified) (1 diff)
• mcalib/CalibLinkDef.h (modified) (1 diff)
• mcalib/MMcCalibrationCalc.cc (added)
• mcalib/MMcCalibrationCalc.h (added)
• mcalib/Makefile (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/01/21: Abelardo Moralejo
+
+   * mcalib/MMcCalibrationCalc.[h,cc]
+     - Added. First version of the task intended to calculate the
+       conversion factors from ADC counts to photons in the MC. It has
+       a different aim than the recently renamed class 
+       "MMcCalibrationUpdate" (which takes care that the correct 
+       pedestals and conversion factors are supplied to each event, but 
+       does not really calculate anything).
+
+   * mcalib/Makefile, CalibLinkDef.h
+     - Added new class MMcCalibrationCalc
+
+   * manalysis/MMcCalibrationUpdate.[h,cc]
+     - Now the container MCalibrationCam is not created or modified if
+       it is found that one such container already exists in the 
+       Parameter list (from a previous calibration).
+
 
  2004/01/21: Thomas Bretz
@@ -16 +34 @@
 
 
- 2004/01/21: Abelardo moralejo
+ 2004/01/21: Abelardo Moralejo
 
    * mmc/MMcEvt.hxx

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -73 +73 @@
     fADC2PhOuter = 1.;
 
+    fFillCalibrationCam = kTRUE;
+
 }
 
@@ -117 +119 @@
     return kTRUE;
 
-  fCalCam = (MCalibrationCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationCam"));
+
+  fCalCam = (MCalibrationCam*) pList->FindObject(AddSerialNumber("MCalibrationCam"));
   if ( !fCalCam )
     {
-      *fLog << err << dbginf << "Cannot create MCalibrationCam... aborting." << endl;
-      return kFALSE;
+      *fLog << warn << dbginf << AddSerialNumber("MCalibrationCam") << " does not exist... Creating." << endl;
+
+      fCalCam = (MCalibrationCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationCam"));
+      if ( !fCalCam )
+        {
+          *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MCalibrationCam") << "... aborting." << endl;
+          return kFALSE;
+        }
+    }
+  else
+    {
+      fFillCalibrationCam = kFALSE;
+      *fLog << warn << dbginf << AddSerialNumber("MCalibrationCam") << " already exists... " << endl;
     }
 
@@ -185 +199 @@
     fConversionHiLo = fHeaderFadc->GetLow2HighGain();
 
+    //
+    // If MCalibrationCam already existed in the parameter list before
+    // MMcCalibrationUpdate::PreProcess was executed (from a 
+    // previous calibration loop) we must not fill it, hence nothing
+    // else has to be done in ReInit:
+    //
+    if ( !fFillCalibrationCam )
+      return kTRUE;
+
 
     const int num = fCalCam->GetSize();

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h

@@ -30 +30 @@
     Float_t fConversionHiLo;
 
+    Bool_t  fFillCalibrationCam;
+
 public:
     MMcCalibrationUpdate(const char *name=NULL, const char *title=NULL);

trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

@@ -17 +17 @@
 #pragma link C++ class MHCalibrationPixel+;
 
+#pragma link C++ class MMcCalibrationCalc++;
+
 #endif

trunk/MagicSoft/Mars/mcalib/Makefile

@@ -23 +23 @@
 #
 INCLUDES = -I. -I../mbase -I../mhbase -I../mgui -I../mgeom -I../manalysis \
-           -I../mraw -I../mtools
+           -I../mraw -I../mtools -I../mmc -I../mimage
+
 # mhbase:    MBinning MH 
 # mgui:      MCamEvent (McalibrationCam)
 # mgeom:     MGeomCam (McalibrationCam - necessary?)
 # manalysis: MExtractedSignal, MCerPhotEvt (move to mcalib?)
-# mraw:      MRawRunHeader, MRawEvtHeader, MRawEvtPixelIter (3xMCalibrationCalc)
-
+# mraw:      MRawRunHeader, MRawEvtHeader, MRawEvtPixelIter (3xMCalibrationCalc)# mmc:       MMcFadcHeader, MMcEvt
+# mimage     MHillas
 
 #------------------------------------------------------------------------------
@@ -43 +44 @@
            MHCalibrationBlindPixel.cc \
            MHCalibrationPINDiode.cc \
-           MHCalibrationPixel.cc 
+           MHCalibrationPixel.cc \
+           MMcCalibrationCalc.cc
 
 SRCS    = $(SRCFILES)