Changeset 7864


Ignore:
Timestamp:
08/08/06 16:04:31 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r7863 r7864  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20 2006/08/08 Thomas Bretz
     21
     22   * mbadpixels/MBadPixelsCam.cc:
     23     - added some comments
     24
     25   * mhist/MHEvent.cc:
     26     - replaced GetTheta() by GetTelescopeTheta()
     27
     28   * msignal/MExtractedSignalCam.cc:
     29     - some update to returning the hi-/lo-gain ratio
     30
     31
     32
    2033 2006/08/08 Daniela Dorner
    2134
  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

    r7804 r7864  
    312312        return 0;
    313313
     314    // Check whether more than one neighbor contains useful information,
     315    // which mean it can later be interpolated
    314316    if (GetNumSuitableNeighbors(type, *pix)>1)
    315317        return 0;
    316318
     319    // If the requested area-index is valid check whether it is the requested one
    317320    if (aidx>=0 && pix->GetAidx()!=aidx)
    318321        return 1;
    319322
     323    // Remove the pixel from the list of pixels to be checked
    320324    list.RemoveAt(idx);
    321325
     326    // Do the same for the neighbor pixels recursively and count the 1-results
    322327    Short_t cnt = 1;
    323328    const Int_t n = pix->GetNumNeighbors();
     
    325330        cnt += GetNumMaxCluster(type, list, pix->GetNeighbor(i), aidx);
    326331
     332    // return the number of neighbor pixels/clusters which have unsuitable-type type
    327333    return cnt;
    328334}
  • trunk/MagicSoft/Mars/mhist/MHEvent.cc

    r7297 r7864  
    295295        s += (int)(fMcEvt->GetImpact()/100+.5);
    296296        s += "m Zd=";
    297         s += (int)(fMcEvt->GetTheta()*180/TMath::Pi()+.5);
     297        s += 0.1*TMath::Nint(fMcEvt->GetTelescopeTheta()*180/TMath::Pi()*10);
    298298        s += "\\circ ";
    299299        if (fMcEvt->GetPhotElfromShower()>=10000)
  • trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.cc

    r7842 r7864  
    183183            return kFALSE;
    184184
     185        if (pix.GetExtractedSignalLoGain()<=0 || pix.GetExtractedSignalHiGain()<=0)
     186            return kFALSE;
     187
     188        //val = log10(pix.GetExtractedSignalHiGain())-log10(pix.GetExtractedSignalLoGain());
     189        //return TMath::Abs(val-1)<0.4;
    185190        val = pix.GetExtractedSignalHiGain()/pix.GetExtractedSignalLoGain();
    186         return pix.GetExtractedSignalLoGain()>2 && val<25;
     191        //return val>4 && val<30;
     192        return val>4 && val<35;
    187193
    188194    default:
Note: See TracChangeset for help on using the changeset viewer.