Changeset 19823


Ignore:
Timestamp:
10/27/19 20:38:08 (5 years ago)
Author:
tbretz
Message:
There was a bug calling InitFact (an old line survcived)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/mraw/MRawFitsRead.cc

    r19707 r19823  
    165165    fRawRunHeader->SetObservation(type=="4294967295"?"":fin.GetStr("RUNTYPE"), "FACT");
    166166    fRawRunHeader->SetRunInfo(0, fin.GetUInt("NIGHT"), fin.GetUInt("RUNID"));
     167
     168    const UShort_t *mmap = fPixelMap.size()==0 || fIsMc ? nullptr : fPixelMap.data();
    167169    if (fin.GetStr("CAMERA")!="MGeomCamFAMOUS")
    168         fRawRunHeader->InitFact(fin.GetUInt("NPIX")/9, 9, fin.GetUInt("NROI"), fPixelMap.size()==0?0:fPixelMap.data());
     170        fRawRunHeader->InitFact(fin.GetUInt("NPIX")/9, 9, fin.GetUInt("NROI"), mmap);
    169171    else
    170         fRawRunHeader->InitFact(1, fin.GetUInt("NPIX"), fin.GetUInt("NROI"), fPixelMap.size()==0?0:fPixelMap.data());
    171     fRawRunHeader->InitFact(1, fin.GetUInt("NPIX"), fin.GetUInt("NROI"), fPixelMap.size()==0?0:fPixelMap.data());
     172        fRawRunHeader->InitFact(1, fin.GetUInt("NPIX"), fin.GetUInt("NROI"), mmap);
     173
    172174    fRawRunHeader->SetFormat(0xf172, fIsMc ? 0 : fin.GetUInt("BLDVER"));
    173175    fRawRunHeader->SetRunType(fIsMc ? 0x0100/*mc*/ : 0/*data*/);
Note: See TracChangeset for help on using the changeset viewer.