Changeset 4608 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
08/13/04 08:00:25 (20 years ago)
Author:
hbartko
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r4605 r4608  
    1919
    2020                                                 -*-*- END OF LINE -*-*-
     21
     22
     23 2004/08/12: Hendrik Bartko
     24
     25   * msignal/MExtractor.cc:
     26     - corrected the setting of AddSerialNumber for Find(Create)Object
     27
     28   * msignal/MExtractTime.cc:
     29     - corrected the setting of AddSerialNumber for FindObject
     30
     31   * mbadpixels/MBadPixelsCalc.cc
     32     - corrected the setting of AddSerialNumber for FindObject
     33
     34   * mbadpixels/MBadPixelsTreat.cc
     35     - corrected the setting of AddSerialNumber for FindObject
     36
     37   * mimage/MImgCleanStd.cc
     38     - corrected the setting of AddSerialNumber for FindObject
     39
     40
    2141
    2242  2004/08/12: Markus Gaug

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

    r4586 r4608  
    102102    if (fPedestalLevel>0)
    103103    {
    104       fPedPhotCam = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer,  AddSerialNumber("MPedPhotCam"));
     104      fPedPhotCam = (MPedPhotCam*)pList->FindObject(AddSerialNumber(fNamePedPhotContainer), "MPedPhotCam");
    105105        if (!fPedPhotCam)
    106106        {

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

    r4586 r4608  
    121121    }
    122122
    123     fPedPhot = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer, AddSerialNumber("MPedPhotCam"));
     123    fPedPhot = (MPedPhotCam*)pList->FindObject(AddSerialNumber(fNamePedPhotContainer), "MPedPhotCam");
    124124    if (!fPedPhot)
    125125    {

  • trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

    r4600 r4608  
    169169  if (TestFlag(kRun))
    170170  {
    171     fPedestal = (MPedestalCam*)pList->FindObject(fNamePedADCRunContainer, AddSerialNumber("MPedestalCam"));
     171    fPedestal = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedADCRunContainer), "MPedestalCam");
    172172    if (!fPedestal)
    173173    { 
    … …  
    181181  if (TestFlag(kEvent))
    182182  {
    183     fPedestalFromData = (MPedestalCam*)pList->FindObject(fNamePedADCEventContainer, AddSerialNumber("MPedestalCam"));
     183    fPedestalFromData = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedADCEventContainer), "MPedestalCam");
    184184    if (!fPedestalFromData)
    185185    {
    … …  
    226226  if (TestFlag(kRun))
    227227    {
    228       fPedPhot = (MPedPhotCam*)pList->FindCreateObj(AddSerialNumber("MPedPhotCam"), fNamePedPhotRunContainer);
     228      fPedPhot = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam", AddSerialNumber(fNamePedPhotRunContainer));
    229229      if (!fPedPhot)
    230         {
    231         *fLog << err << "container 'MPedPhotCam'"
    232               << " not found ... aborting" << endl;
    233         return kFALSE;
    234         }
     230        return kFALSE;
     231       
    235232    }
    236233
    … …  
    238235  if (TestFlag(kEvent))
    239236    { 
    240       fPedPhotFromData = (MPedPhotCam*)pList->FindCreateObj(AddSerialNumber("MPedPhotCam"),
    241                                                             fNamePedPhotEventContainer);
     237      fPedPhotFromData = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam", AddSerialNumber(fNamePedPhotEventContainer));
    242238      if (!fPedPhotFromData)
    243         {
    244           *fLog << err << "container 'MPedPhotCamFromData'"
    245                 << " not found ... aborting" << endl;
    246           return kFALSE;
    247       }
     239        return kFALSE;
     240     
    248241    }
    249242 

  • trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

    r4586 r4608  
    510510    }
    511511
    512     fPed = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer, AddSerialNumber("MPedPhotCam"));
     512    fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber(fNamePedPhotContainer), "MPedPhotCam");
    513513    if (!fPed)
    514514    {

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

    r4586 r4608  
    129129 
    130130
    131   fPedestals = (MPedestalCam*)pList->FindObject(fNamePedContainer, AddSerialNumber("MPedestalCam"));
     131  fPedestals = (MPedestalCam*)pList->FindObject( AddSerialNumber(fNamePedContainer), "MPedestalCam");
    132132  if (!fPedestals)
    133133    {

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

    r4601 r4608  
    143143        return kFALSE;
    144144
    145     fPedestals = (MPedestalCam*)pList->FindObject(fNamePedContainer, AddSerialNumber("MPedestalCam"));
     145    fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedContainer), "MPedestalCam");
    146146    if (!fPedestals)
    147147    {
Note: See TracChangeset for help on using the changeset viewer.