Changeset 3734 for trunk


Ignore:
Timestamp:
04/14/04 16:35:59 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3733 r3734  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20 2004/04/14: Thomas Bretz
     21
     22   * manalysis/MCerPhotEvt.[h,cc]:
     23     - fixed a bug which caused a missing last pixel (in most cases
     24       Index 576)
     25
     26   * manalysis/MCerPhotPix.cc:
     27     - fixed output in Print
     28
     29   * macros/mccalibrate.C, mmain/MEventDisplay.cc:
     30     - added missing SetCalibrationMethod
     31
     32   * mbadpixels/MBadPixelsCam.[h,cc]:
     33     - added copy constructor
     34
     35   * mbadpixels/MBadPixelsMerge.cc:
     36     - added comments
     37
     38   * mraw/MRawRunHeader.[h,cc]:
     39     - added new run-type (kRTPointRun=7)
     40
     41
     42
    2043 2004/04/14: Markus Gaug
    2144 
    … …  
    4063
    4164
     65
    4266 2004/04/13: Markus Gaug
    4367
    … …  
    78102     - set the possibility to choose different displays
    79103 
    80 
    81104   * mcalib/MCalibrationChargeCalc.cc
    82105     - set the pulser colour (now obligatory)
    83106
    84 
    85107   * mcalib/MCalibrationChargePix.[h,cc]
    86108     - put GetRSigmaPerCharge into this class
     109
    87110
    88111

  • trunk/MagicSoft/Mars/macros/mccalibrate.C

    r3441 r3734  
    101101
    102102  MCalibrate calib; // Transforms signals from ADC counts into photons.
     103  calib.SetCalibrationMethod(MCalibrate::kDummy);
    103104
    104105  //    MBlindPixelCalc   blind;
    … …  
    169170    }
    170171
     172  calib.SetCalibrationMethod(MCalibrate::kFfactor);
     173
    171174  //
    172175  // Second loop: analysis loop

  • trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

    r3541 r3734  
    9696void MCerPhotEvt::Reset()
    9797{
    98     fNumPixels = 0;
    99     fMaxIndex  = 0;
     98    fNumPixels =  0;
     99    fMaxIndex  = -1;
    100100    fLut.Set(0);
    101101    // fPixels->Delete();
    … …  
    104104void MCerPhotEvt::FixSize()
    105105{
    106     fLut.Set(fMaxIndex);
     106    fLut.Set(fMaxIndex+1);
    107107
    108108    if (fPixels->GetEntriesFast() == (Int_t)fNumPixels)
    … …  
    401401
    402402        fLut[idx] = fNumPixels;
    403         if ((UInt_t)idx>fMaxIndex)
    404             fMaxIndex=(UInt_t)idx;
     403        if (idx>fMaxIndex)
     404            fMaxIndex=idx;
    405405
    406406        return new ((*fPixels)[fNumPixels++]) MCerPhotPix(idx, nph, er);

  • trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

    r3541 r3734  
    2424private:
    2525    UInt_t        fNumPixels;
    26     UInt_t        fMaxIndex;
     26     Int_t        fMaxIndex;
    2727    TArrayI       fLut;        // Lookup tabel to lookup pixel by index
    2828    TClonesArray *fPixels;     //-> FIXME: Change TClonesArray away from a pointer?

  • trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc

    r3466 r3734  
    7373    gLog << (fRing>0?"   Used ":" Unused ");
    7474    gLog << (fIsCore?" Core ":"      ");
    75     gLog << "High gain " << (fIsHGSaturated?"   ":"not") << " saturated";
    76     gLog << (fIsSaturated?"   ":"Not") << " saturated";
    77     gLog << " Nphot= " << fPhot << " Error(Nphot)=" << fErrPhot << endl;
     75    gLog << (fIsSaturated?"   ":"not") << " saturated ";
     76    gLog << "High gain " << (fIsHGSaturated?"   ":"not") << " saturated ";
     77    gLog << "Nphot= " << fPhot << " Error(Nphot)=" << fErrPhot << endl;
    7878}

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

    r3732 r3734  
    5353{
    5454    fName  = name  ? name  : "MBadPixelsCam";
    55     fTitle = title ? title : "";
     55    fTitle = title ? title : "Storage container to store bad pixel information";
    5656
    5757    fArray = new TClonesArray("MBadPixelsPix", 1);
     58}
     59
     60MBadPixelsCam::MBadPixelsCam(const MBadPixelsCam &cam)
     61{
     62    fName  = "MBadPixelsCam";
     63    fTitle = "Storage container to store bad pixel information";
     64
     65    fArray = new TClonesArray("MBadPixelsPix", 1);
     66    cam.Copy(*fArray);
    5867}
    5968
    … …  
    342351      val = (*this)[idx].GetInfo()[0];
    343352      return (*this)[idx].IsOK();
    344       break;
    345353    case 1:
    346354      val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun);
    347355      return val;
    348       break;
    349356    case 2:
    350357      val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableEvt);
    351358      return val;
    352       break;
    353359    case 3:
    354360      val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnreliableRun);
    355361      return val;
    356       break;
    357362    case 4:
    358363      val = (*this)[idx].IsHiGainBad();
    359364      return val;
    360       break;
    361365    case 5:
    362366      val = (*this)[idx].IsLoGainBad();
    363367      return val;
    364       break;
    365368    case 6:
    366369      val = !(*this)[idx].IsCalibrationSignalOK();
    367370      return val;
    368       break;
    369371    case 7:
    370372      val = !(*this)[idx].IsCalibrationResultOK();
    371373      return val;
    372       break;
    373374    case 8:
    374375      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainNotFitted);
    375376      return val;
    376       break;
    377377    case 9:
    378378      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainNotFitted);
    379379      return val;
    380       break;
    381380    case 10:
    382381      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainOscillating);
    383382      return val;
    384       break;
    385383    case 11:
    386384     val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainOscillating);
    387385      return val;
    388       break;
    389386    case 12:
    390387      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainSaturation );
    391388      return val;
    392       break;
    393389    case 13:
    394390      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeIsPedestal );
    395391      return val;
    396       break;
    397392    case 14:
    398393      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeErrNotValid);
    399394      return val;
    400       break;
    401395    case 15:
    402396      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeRelErrNotValid);
    403397      return val;
    404       break;
    405398    case 16:
    406399      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeSigmaNotValid );
    407400      return val;
    408       break;
    409401    case 17:
    410402      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInFirstBin  );
    411403      return val;
    412       break;
    413404    case 18:
    414405      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInLast2Bins );
    415406      return val;
    416       break;
    417407    case 19:
    418408      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kDeviatingNumPhes    );
    419409      return val;
    420       break;
    421410    case 20:
    422411      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeNotFitted );
    423412      return val;
    424       break;
    425413    case 21:
    426414      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeOscillating  );
    427415      return val;
    428       break;
    429416    default:
    430417      return kFALSE;

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.h

    r3068 r3734  
    1919public:
    2020    MBadPixelsCam(const char *name=NULL, const char *title=NULL);
     21    MBadPixelsCam(const MBadPixelsCam &cam);
    2122    ~MBadPixelsCam();
    2223

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsMerge.cc

    r3461 r3734  
    2626//
    2727//  MBadPixelsMerge
     28//  ===============
    2829//
    2930//  Merges in ReInit two bad pixel containers together:
    … …  
    3334//      into the container given in the constructor. While the contents
    3435//      to which 1) refers are still untouched.
     36//
     37//
     38// An explanation taken from Mantis:
     39// --------------------------------
     40// In my eyes everything works a supposed to do. We have different sources
     41// for bad-pixels, eg from Pedestal calculation, from the calibration
     42// constant calculation, manual setting and so on. If processing data we
     43// have to take care of all this different sources. Therefor we have to
     44// store the bad pixels from this sources (eg. from calibration). In
     45// addition MBadPixelsCam is read from the file containing the data (once
     46// per file). Now always after a new (data-)file has been opened the bad
     47// pixels from (for example) the calibration file have to be merged into
     48// the container loaded from the (data-)file which is stored in the
     49// parameter list. Copying the pointer would totally overwrite the pixels
     50// loaded (automatically by MReadMarsFile) from the data-file. All this is
     51// done using a copy of the original MBadPixelsCam (fSource). In addition
     52// fDest is initialized to the pointer given as argument to the
     53// constructor. To keep track of all bad pixels the instance this pointer
     54// is pointing to is used to collect all bad pixels used so far.
     55//
    3556//
    3657//  Input Containers:
    … …  
    6990    fTitle = title ? title : fgDefTitle.Data();
    7091
    71     fSource = new MBadPixelsCam;
    72     bad->Copy(*fSource);
     92    fSource = new MBadPixelsCam(*bad);
    7393}
    7494

  • trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

    r3682 r3734  
    243243    MCerPhotAnal2     *nanal = new MCerPhotAnal2;
    244244    MFillH            *fill1 = new MFillH(evt1, "MCerPhotEvt", "MFillH1");
    245     MImgCleanStd      *clean = new MImgCleanStd;
     245    MImgCleanStd      *clean = new MImgCleanStd(6.5, 6.5);
    246246    MFillH            *fill2 = new MFillH(evt2, "MCerPhotEvt", "MFillH2");
    247247    MFillH            *fill3 = new MFillH(evt3, "MPedPhotCam", "MFillH3");
    … …  
    271271
    272272        MCalibrate* mccal = new MCalibrate;
     273        mccal->SetCalibrationMethod(MCalibrate::kDummy);
    273274
    274275        // MC

  • trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

    r3374 r3734  
    190190    case kRTCalibration:
    191191        return "Calibration";
     192    case kRTPointRun:
     193        return "Point-Run";
    192194    case kRTMonteCarlo:
    193195        return "Monte Carlo";

  • trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

    r3389 r3734  
    2525        kRTPedestal    = 0x0001,
    2626        kRTCalibration = 0x0002,
     27        kRTPointRun    = 0x0007,
    2728        kRTMonteCarlo  = 0x0100,
    2829        kRTNone        = 0xffff
Note: See TracChangeset for help on using the changeset viewer.