Changeset 8498 for trunk


Ignore:
Timestamp:
05/11/07 16:47:18 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8496 r8498  
    7070     - adapted GetPixelContent accordingly
    7171     - increased class version to 2
     72
     73   * manalysis/MCameraData.cc:
     74     - added include of TArrayI (previously included from MPedestalCam)
     75
     76   * mcalib/MCalibrationChargeCam.cc, mcalib/MCalibrationRelTimeCam.cc:
     77     - fixed GetPixelContant to give more proper output
     78     - reformatted GetPIxelContent code
     79     - added const-qualifiers
     80
     81   * mjobs/MJCalibTest.cc, mjobs/MJCalibrateSignal.cc,
     82     mjobs/MJCalibration.cc, mjobs/MJPedestal.cc,
     83     mpedestal/MExtractPedestal.[h,cc], msignal/MExtractor.[h,cc],
     84     msignal/MExtractBlindPixel.cc, msignal/MExtractPINDiode.cc:
     85     - removed data members fPedestal and fPedestalsIn respectively,
     86       and all referencing functions because it was never used at all
    7287
    7388

  • trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

    r8434 r8498  
    396396  MExtractTimeAndChargeSpline spline;
    397397
    398   spline.SetPedestals(&pedcam);
    399 
    400398  MTaskEnv taskenv1("ExtractSignal");
    401399  MTaskEnv taskenv2("ExtractTime");
    402400
    403401  if (extractor1)
    404     {
    405       extractor1->SetPedestals(&pedcam);
    406402      taskenv1.SetDefault(extractor1);
    407     }
    408403
    409404  if (extractor2)
    410     {
    411       fTimeExtractor->SetPedestals(&pedcam);
    412405      taskenv2.SetDefault(fTimeExtractor);
    413     }
    414406  else if (!(extractor1->InheritsFrom("MExtractTimeAndCharge")))
    415407    {
    416       spline.SetPedestals(&pedcam);
    417408      spline.SetWindowSize(8,8);
    418409      taskenv2.SetDefault(&spline);
    … …  
    544535
    545536}
    546 

  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r8489 r8498  
    418418    pedlo2.SetPedestalUpdate(kTRUE);
    419419    pedlo2.SetRandomCalculation(kTRUE);
    420     pedlo2.SetNamePedestalCamIn("MPedestalFundamental");
    421420    pedlo2.SetNamePedestalCamOut("MPedestalFromExtractorRndm");
    422421
    … …  
    424423    pedlo3.SetPedestalUpdate(kTRUE);
    425424    pedlo3.SetRandomCalculation(kFALSE);
    426     pedlo3.SetNamePedestalCamIn("MPedestalFundamental");
    427425    pedlo3.SetNamePedestalCamOut("MPedestalFromExtractor");
    428426
    … …  
    432430        return kFALSE;
    433431    }
    434 
    435     extractor1->SetPedestals(&pedcamab);
    436432
    437433    // Setup to use the hi-gain extraction window in the lo-gain
    … …  
    460456    }
    461457
    462     if (extractor2)
    463         extractor2->SetPedestals(&pedcamab);
    464 
    465     if (extractor3)
    466         extractor3->SetPedestals(&pedcamab);
    467 
    468458    //------------------------------
    469459    MFTriggerPattern ftp2;
    … …  
    530520    MCalibCalcFromPast      pacalc;
    531521
    532     pinext.SetPedestals(&pedcamab);
    533     bldext.SetPedestals(&pedcamab);
    534522    chcalc.SetPedestals(&pedcamextr);
    535523

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r8484 r8498  
    18021802    // Produce pedestal subtracted raw-data
    18031803    MPedestalSubtract pedsub;
    1804     pedsub.SetPedestalCam(fExtractor->GetPedestals());
    18051804    tlist.AddToList(&pedsub);
    18061805

  • trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

    r8449 r8498  
    11881188    }
    11891189
    1190     pedcalc.SetPedestalsIn(&fPedestalCamIn);
    1191     pedlogain.SetPedestalsIn(&fPedestalCamIn);
    1192 
    11931190    pedcalc.SetPedestalsOut(&fPedestalCamOut);
    11941191    pedlogain.SetPedestalsOut(&fPedestalCamOut);
    … …  
    11971194    if (fExtractor)
    11981195    {
    1199         fExtractor->SetPedestals(&fPedestalCamIn);
    1200 
    12011196        if (fExtractionType!=kFundamental)
    12021197        {

  • trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

    r8490 r8498  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.29 2007-05-11 10:25:45 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.30 2007-05-11 15:47:18 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    194194//
    195195MExtractPedestal::MExtractPedestal(const char *name, const char *title)
    196     : fGeom(NULL), fPedestalsIn(NULL), fPedestalsInter(NULL),
     196    : fGeom(NULL), fPedestalsInter(NULL),
    197197    fPedestalsOut(NULL), fExtractor(NULL), fSignal(0),
    198198    fExtractWinFirst(0), fExtractWinSize(0), fUseSpecialPixels(kFALSE)
    … …  
    204204    SetRandomCalculation  ( kTRUE  );
    205205
    206     SetNamePedestalCamIn();
    207206    SetNamePedestalCamOut();
    208207    SetNamePedestalCamInter();
    … …  
    427426  }
    428427
    429   if (fExtractor && !fPedestalsIn)
    430   {
    431       fPedestalsIn = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCamIn), "MPedestalCam");
    432       if (!fPedestalsIn)
    433       {
    434           *fLog << err << AddSerialNumber(fNamePedestalCamIn) << " not found... aborting." << endl;
    435           return kFALSE;
    436       }
    437   }
    438 
    439428  if (!fPedestalsInter && fIntermediateStorage)
    440429  {
    … …  
    603592Int_t MExtractPedestal::PostProcess()
    604593{
    605     fPedestalsIn = NULL;
    606594    return fExtractor ? fExtractor->CallPostProcess() : kTRUE;
    607595}
    … …  
    947935{
    948936    *fLog << GetDescriptor() << ":" << endl;
    949     *fLog << "Name of input  MPedestalCam:  " << (fPedestalsIn?fPedestalsIn->GetName():fNamePedestalCamIn.Data()) << " (" << fPedestalsIn << ")" << endl;
    950937    *fLog << "Name of interm. MPedestalCam: " << (fPedestalsInter?fPedestalsInter->GetName():fNamePedestalCamInter.Data()) << " (" << fPedestalsInter << ")" << endl;
    951938    *fLog << "Name of output MPedestalCam:  " << (fPedestalsOut?fPedestalsOut->GetName():fNamePedestalCamOut.Data()) << " (" << fPedestalsOut << ")" << endl;
    … …  
    10331020    }
    10341021
    1035     // find resource for MPedestalCam
    1036     if (IsEnvDefined(env, prefix, "NamePedestalCamIn", print))
    1037     {
    1038         SetNamePedestalCamIn(GetEnvValue(env, prefix, "NamePedestalCamIn", fNamePedestalCamIn));
    1039         rc = kTRUE;
    1040     }
    1041 
    10421022    if (IsEnvDefined(env, prefix, "NamePedestalCamInter", print))
    10431023    {

  • trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h

    r8490 r8498  
    3434  static const UShort_t fgMaxSignalVar;     //! The maximum difference between the highest and lowest slice
    3535
    36   TString fNamePedestalCamIn;        // Name of the incoming 'MPedestalCam' container
    3736  TString fNamePedestalCamOut;       // Name of the outgoing 'MPedestalCam' container
    3837  TString fNamePedestalCamInter;     // Name of the intermediate 'MPedestalCam' container
    … …  
    5049
    5150  MGeomCam      *fGeom;              //! Camera geometry
    52   MPedestalCam  *fPedestalsIn;       //! Pedestals of all pixels in the camera (incoming)
    5351  MPedestalCam  *fPedestalsInter;    //! Pedestals of all pixels in the camera (intermediate)
    5452  MPedestalCam  *fPedestalsOut;      //! Pedestals of all pixels in the camera (outgoing)
    … …  
    130128
    131129  // names
    132   void SetNamePedestalCamIn   (const char *name=fgNamePedestalCam) { fNamePedestalCamIn    = name; }
    133130  void SetNamePedestalCamInter(const char *name=fgNamePedestalCam) { fNamePedestalCamInter = name; }
    134131  void SetNamePedestalCamOut  (const char *name=fgNamePedestalCam) { fNamePedestalCamOut   = name; }
    … …  
    137134  // pointers
    138135  void SetExtractor     ( MExtractTimeAndCharge *e) { fExtractor      = e; }
    139   void SetPedestalsIn   ( MPedestalCam *pedcam    ) { fPedestalsIn    = pedcam; }
    140136  void SetPedestalsInter( MPedestalCam *pedcam    ) { fPedestalsInter = pedcam; }
    141137  void SetPedestalsOut  ( MPedestalCam *pedcam    ) { fPedestalsOut   = pedcam; }

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

    r8490 r8498  
    231231
    232232  fBlindPixel->SetExtractionType(fExtractionType);
    233 
     233/*
    234234  for (UInt_t i=0;i<fBlindPixelIdx.GetSize();i++)
    235235  {
    … …  
    246246      }
    247247  }
    248 /*
     248
    249249  const Int_t higainsamples = fRunHeader->GetNumSamplesHiGain();
    250250  const Int_t logainsamples = fRunHeader->GetNumSamplesLoGain();

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

    r8367 r8498  
    208208
    209209  fPedMean.Reset();
    210 
     210/*
    211211  const MPedestalPix &ped   = (*fPedestals)[fPINDiodeIdx];
    212212
    … …  
    222222        return kFALSE;
    223223    }
    224  
     224  */
    225225  if (fSlices)
    226226    delete fSlices;

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

    r8364 r8498  
    115115
    116116const UInt_t  MExtractor::fgSaturationLimit = 245;
    117 const TString MExtractor::fgNamePedestalCam = "MPedestalCam";
    118117const TString MExtractor::fgNameSignalCam   = "MExtractedSignalCam";
    119118const Float_t MExtractor::fgOffsetLoGain    = 1.51;   // 5 ns
    … …  
    127126// - all variables to 0
    128127// - fSaturationLimit to fgSaturationLimit
    129 // - fNamePedestalCam to fgNamePedestalCam
    130128// - fNameSignalCam to fgNameSignalCam
    131129// - fNoiseCalculation to kFALSE
    … …  
    133131MExtractor::MExtractor(const char *name, const char *title)
    134132    : fResolutionPerPheHiGain(0), fResolutionPerPheLoGain(0),
    135     fPedestals(NULL), fSignals(NULL), fRawEvt(NULL), fRunHeader(NULL),
    136     fSignal(NULL),
     133    fSignals(NULL), fRawEvt(NULL), fRunHeader(NULL), fSignal(NULL),
    137134      /*fHiLoLast(0),*/ fNumHiGainSamples(0), fNumLoGainSamples(0)
    138135{
    … …  
    140137    fTitle = title ? title : "Base class for signal extractors";
    141138
    142     SetNamePedestalCam();
    143139    SetNameSignalCam();
    144140    SetOffsetLoGain();
    … …  
    162158//     MRawEvtData
    163159//     MRawRunHeader
    164 //     MPedestalCam
    165160//
    166161Int_t MExtractor::PreProcessStd(MParList *pList)
    … …  
    185180    {
    186181        *fLog << err << AddSerialNumber("MPedestalSubtractedEvt") << " not found... aborting." << endl;
    187         return kFALSE;
    188     }
    189 
    190 
    191     if (fPedestals)
    192         return kTRUE;
    193 
    194     fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCam), "MPedestalCam");
    195     if (!fPedestals)
    196     {
    197         *fLog << err << AddSerialNumber(fNamePedestalCam) << " [MPedestalCam] not found... aborting" << endl;
    198182        return kFALSE;
    199183    }
    … …  
    207191//  - MRawEvtData
    208192//  - MRawRunHeader
    209 //  - MPedestalCam
    210193//
    211194// The following output containers are also searched and created if
    … …  
    480463        *fLog << " Num Samples Hi/Lo:  " << Form("%2.1f %2.1f", fNumHiGainSamples, fNumLoGainSamples) << endl;
    481464    }
    482     if (fPedestals)
    483         *fLog << " Pedestals:          " << fPedestals->GetName() << ", " << fPedestals << endl;
    484 }
     465}

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

    r8364 r8498  
    1717class MRawRunHeader;
    1818
    19 class MPedestalCam;
    2019class MPedestalSubtractedEvt;
    2120class MExtractedSignalCam;
    … …  
    3332protected:
    3433  static const UInt_t  fgSaturationLimit;  //! Default for fSaturationLimit (now set to: 254)
    35   static const TString fgNamePedestalCam;  //! "MPedestalCam"
    3634  static const TString fgNameSignalCam;    //! "MExtractedSignalCam"
    3735 
    3836  Float_t fOffsetLoGain;                   // Offset of the low-gain signal w.r.t. the High-Gain slices
    3937
    40   MPedestalCam        *fPedestals;         //! Pedestals of all pixels in the camera
    4138  MExtractedSignalCam *fSignals;           //! Extracted signal of all pixels in the camera
    42                                        
     39
    4340  MRawEvtData         *fRawEvt;            //! Raw event data (time slices)
    4441  MRawRunHeader       *fRunHeader;         //! RunHeader information
    4542
    4643  MPedestalSubtractedEvt *fSignal;         //!
    47                                        
     44
    4845  Byte_t   fHiGainFirst;                   // First FADC slice nr. to extract the High Gain signal
    4946  Byte_t   fHiGainLast;                    // Last FADC slice nr. to extract the High Gain signal
    … …  
    6158  UInt_t   fSaturationLimit;               // Highest FADC slice value until being declared saturated
    6259
    63   TString  fNamePedestalCam;               // Name of the 'MPedestalCam' container
    6460  TString  fNameSignalCam;                 // Name of the 'MExtractedSignalCam' container
    6561
    … …  
    107103  void SetOffsetLoGain    ( const Float_t  f=fgOffsetLoGain          ) { fOffsetLoGain     = f;    }
    108104  void SetSaturationLimit ( const UInt_t lim=fgSaturationLimit       ) { fSaturationLimit  = lim;  }
    109   void SetNamePedestalCam ( const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam  = name; }
    110105  void SetNameSignalCam   ( const char *name=fgNameSignalCam.Data()  ) { fNameSignalCam    = name; }
    111106  void SetNoiseCalculation( const Bool_t   b=kTRUE                   ) { fNoiseCalculation = b;    }
    112 
    113   void SetPedestals (MPedestalCam *pedcam)   { fPedestals = pedcam; }
    114   MPedestalCam *GetPedestals()   { return fPedestals; }
    115107
    116108  // TObject
Note: See TracChangeset for help on using the changeset viewer.