Changeset 5548 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
12/02/04 15:15:02 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r5547 r5548  
    2121                                                 -*-*- END OF LINE -*-*-
    2222
     23 2004/12/02: Thomas Bretz
     24
     25   * msignal/MExtractTime.cc, msignal/MExtractTimeAndCharge.cc,
     26     msignal/MExtractor.cc:
     27     - removed obsolete output after FindCreateObj
     28
     29   * msignal/MExtractor.h:
     30     - don't write fNoiseCalculation to file
     31
     32
     33
    2334 2004/12/01: Markus Gaug and Thomas Schweizer
    2435 
    … …  
    2940
    3041
     42
    3143 2004/12/01: Markus Gaug
    3244
    … …  
    3446     - introduced a random iterator for the "pedestal" calculation of
    3547       the amplitude spline.
    36 
    3748
    3849   * msignal/MExtractTimeAndChargeDigitalFilter.cc:
    … …  
    4455
    4556
     57
    4658 2004/11/30: Thomas Bretz
    4759 
    4860   * msignal/MExtractTimeAndChargeDigitalFilter.cc:
    4961     - InitArrays: added missing return statement
     62
     63
    5064
    5165 2004/11/30: Markus Gaug
    … …  
    86100   * callisto.rc
    87101     - updated pedestal initializations
     102
    88103
    89104

  • trunk/MagicSoft/Mars/msignal/MExtractTime.cc

    r5499 r5548  
    127127  fArrTime = (MArrivalTimeCam*)pList->FindCreateObj("MArrivalTimeCam",AddSerialNumber(fNameTimeCam));
    128128  if (!fArrTime)
    129     {
    130       *fLog << err << fNameTimeCam.Data() << " could not be found nor created... aborting" << endl;
    131129      return kFALSE;
    132     }
    133130
    134131  fPedestals = (MPedestalCam*)pList->FindObject( AddSerialNumber(fNamePedestalCam), "MPedestalCam");

  • trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

    r5540 r5548  
    114114  fSignals = (MExtractedSignalCam*)pList->FindCreateObj("MExtractedSignalCam",AddSerialNumber(fNameSignalCam));
    115115  if (!fSignals)
    116     {
    117       *fLog << err << fNameSignalCam.Data() << " could not be found nor created... aborting" << endl;
    118116      return kFALSE;
    119     }
    120117 
    121118  return kTRUE;

  • trunk/MagicSoft/Mars/msignal/MExtractor.cc

    r5430 r5548  
    163163  if (!fPedestals)
    164164    {
    165       *fLog << err << fNamePedestalCam.Data() << " not found... aborting" << endl;
     165      *fLog << err << fNamePedestalCam << " not found... aborting" << endl;
    166166      return kFALSE;
    167167    }
    … …  
    169169  fSignals = (MExtractedSignalCam*)pList->FindCreateObj("MExtractedSignalCam",AddSerialNumber(fNameSignalCam));
    170170  if (!fSignals)
    171     {
    172       *fLog << err << fNameSignalCam.Data() << " could not be found nor created... aborting" << endl;
    173171      return kFALSE;
    174     }
    175172 
    176173  return kTRUE;

  • trunk/MagicSoft/Mars/msignal/MExtractor.h

    r5425 r5548  
    2626  static const Float_t fgOffsetLoGain;     //! Default for fOffsetLoGain (now set to 1.51 (= 5ns)
    2727 
    28   Bool_t  fNoiseCalculation;               // Flag if extractor determines noise contribution from pedestal file.
     28  Bool_t  fNoiseCalculation;               //! Flag if extractor determines noise contribution from pedestal file.
    2929 
    3030protected:
Note: See TracChangeset for help on using the changeset viewer.