Changeset 10281


Ignore:
Timestamp:
Apr 4, 2011, 10:08:59 AM (10 years ago)
Author:
tbretz
Message:
 
Location:
trunk/Mars
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/Changelog

    r10235 r10281  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2011/04/04 Thomas Bretz
     22
     23   * mreport/MReportFileRead.cc:
     24     - added a missing delete
     25
     26   * mhflux/MHEnergyEst.cc, mhist/MHCamera.cc:
     27     - fixed some crashes with newer root versiony in which
     28       GetFunction("gaus") after an unsuccessfull fit might return
     29       NULL
     30
     31   * mastro/MAstroCatalog.cc:
     32     - added the missing marker color for the dot
     33
     34   * mpointing/MPointingDevCalc.cc:
     35     - added some comments
     36
     37   * mmain/MEventDisplay.cc:
     38     - renamed some local variables to avoid using the same name twice
     39
     40   * mgeom/MGeomCam.cc:
     41     - for convenience a margin of 0 in HitFrame is allowed to
     42       switch off the detection also with 0
     43
     44   * mbase/MThread.h:
     45     - added missing argument to call of fThread.Run()
     46
     47
    2048
    2149 2011/03/10 Thomas Bretz
     
    4472
    4573
    46  2011/02/21 Daniela Dorner
     74 2011/02/21 Thomas Bretz
    4775
    4876   * mcalib/MCalibrateData.cc mcalib/MCalibrationBlindPix.cc
  • trunk/Mars/mastro/MAstroCatalog.cc

    r9518 r10281  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.34 2009-10-26 14:31:17 tbretz Exp $
    3 ! --------------------------------------------------------------------------
    42!
    53! *
     
    865863    // draw star on the camera display
    866864    TMarker *tip=new TMarker(x, y, kDot);
     865    tip->SetMarkerColor(col);
     866
    867867    TAttMarker::Copy(*tip);
    868868
     
    14711471// Handle keyboard events.
    14721472//
    1473 void MAstroCatalog::ExecuteEventKbd(Int_t keycode, Int_t keysym)
     1473void MAstroCatalog::ExecuteEventKbd(Int_t /*keycode*/, Int_t keysym)
    14741474{
    14751475    Double_t dra =0;
  • trunk/Mars/mgeom/MGeomCam.cc

    r10090 r10281  
    432432Bool_t MGeomCam::HitFrame(MQuaternion p, const MQuaternion &u, Double_t margin) const
    433433{
    434     if (margin<=0)
     434    if (margin<0)
    435435        return HitFrame(p, u);
    436436
  • trunk/Mars/mhflux/MHEnergyEst.cc

    r9851 r10281  
    254254    *fLog << " RMS   of Delta E/E: " << Form("%4.2f%%",  100*h->GetRMS()) << endl;
    255255    *fLog << "Results from Histogram-Fit:" << endl;
    256     *fLog << " Bias  of Delta E/E: " << Form("%+4.2f%%", 100*f->GetParameter(1)) << endl;
    257     *fLog << " Sigma of Delta E/E: " << Form("%4.2f%%",  100*f->GetParameter(2)) << endl;
    258     *fLog << " Res   of Delta E/E: " << Form("%4.2f%%",  100*TMath::Hypot(f->GetParameter(1), f->GetParameter(2))) << endl;
     256    if (!f)
     257        *fLog << " <fit did not succeed>" << endl;
     258    else
     259    {
     260        *fLog << " Bias  of Delta E/E: " << Form("%+4.2f%%", 100*f->GetParameter(1)) << endl;
     261        *fLog << " Sigma of Delta E/E: " << Form("%4.2f%%",  100*f->GetParameter(2)) << endl;
     262        *fLog << " Res   of Delta E/E: " << Form("%4.2f%%",  100*TMath::Hypot(f->GetParameter(1), f->GetParameter(2))) << endl;
     263    }
    259264
    260265    delete h;
     
    341346                }
    342347
    343                 hx->Fit("gaus", "Q", "", -0.25, 1.0);
    344                 hx->GetFunction("gaus")->SetLineColor(kBlue);
    345                 hx->GetFunction("gaus")->SetLineWidth(2);
    346                 gPad=NULL;
    347                 gStyle->SetOptFit(101);
     348                if (hx->GetEntries()>0)
     349                {
     350                    hx->Fit("gaus", "Q", "", -0.25, 1.0);
     351                    if (hx->GetFunction("gaus"))
     352                    {
     353                        hx->GetFunction("gaus")->SetLineColor(kBlue);
     354                        hx->GetFunction("gaus")->SetLineWidth(2);
     355                        gPad=NULL;
     356                        gStyle->SetOptFit(101);
     357                    }
     358                }
    348359            }
    349360        }
  • trunk/Mars/mhist/MHCamera.cc

    r10166 r10281  
    23232323    case 4:
    23242324        obj2->Fit("pol0", "Q");
    2325         obj2->GetFunction("pol0")->SetLineColor(kBlue);
     2325        if (obj2->GetFunction("pol0"))
     2326            obj2->GetFunction("pol0")->SetLineColor(kBlue);
    23262327        break;
    23272328
     
    23312332    default:
    23322333        obj2->Fit("gaus", "Q");
    2333         obj2->GetFunction("gaus")->SetLineColor(kBlue);
     2334        if (obj2->GetFunction("gaus"))
     2335            obj2->GetFunction("gaus")->SetLineColor(kBlue);
    23342336        break;
    23352337    }
     
    24022404    obj2->SetBit(kCanDelete);
    24032405    obj2->Fit("pol0","Q","");
    2404     obj2->GetFunction("pol0")->SetLineWidth(1);
     2406    if (obj2->GetFunction("pol0"))
     2407        obj2->GetFunction("pol0")->SetLineWidth(1);
    24052408/*
    24062409    if (GetGeomCam().InheritsFrom("MGeomCamMagic"))
  • trunk/Mars/mmain/MEventDisplay.cc

    r9347 r10281  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.70 2009-02-18 12:06:39 tbretz Exp $
    3 ! --------------------------------------------------------------------------
    42!
    53! *
     
    361359        MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
    362360
    363         MCalibrationPatternDecode *decode = new MCalibrationPatternDecode;
     361        MCalibrationPatternDecode *patdecode = new MCalibrationPatternDecode;
    364362
    365363        MPedestalSubtract *pedsub1  = new MPedestalSubtract("PedSubstract1");
     
    385383        tlist->AddToList(pdnsb);
    386384
    387         tlist->AddToList(decode);
     385        tlist->AddToList(patdecode);
    388386
    389387        tlist->AddToList(pedsub1);   // Produce arrays
  • trunk/Mars/mpointing/MPointingDevCalc.cc

    r10091 r10281  
    301301// model. However, M2 shows a slight offset.
    302302//
     303// [2010-11-11 M. Garcz.]
     304//
     305// Last night, TPoints for M2 taken without target
     306//
    303307// [2010-11-18 M. Garcz.]
    304308//
  • trunk/Mars/mreport/MReportFileRead.cc

    r8963 r10281  
    114114// --------------------------------------------------------------------------
    115115//
    116 // Add a new MReport* to the list (eg 'Drive' will add MReportDrive)
     116// Add a new MReport* to the list. The name is the class name (eg MReportDrive)
    117117// For convinience the object is created as a MReportHelp object.
    118118//
     
    122122
    123123    if (!help->GetReport())
     124    {
     125        delete help;
    124126        return kFALSE;
     127    }
    125128
    126129    if (GetReport(help->GetName()))
     
    203206            continue;
    204207
     208        // Check for MReport{str(0,pos)}
    205209        rep = GetReportHelp(str(0,pos));
     210
     211        // Remove this part from the string
    206212        if (GetReport(rep))
    207213            str.Remove(0, pos);
Note: See TracChangeset for help on using the changeset viewer.