Changeset 1334 for trunk/MagicSoft


Ignore:
Timestamp:
05/29/02 11:14:45 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mdata/MDataChain.cc

    r1332 r1334  
    103103
    104104MDataChain::MDataChain(const char *rule, const char *name, const char *title)
     105    : fOperatorType(kENoop)
    105106{
    106107    fName  = name  ? name  : "MDataChain";
    … …  
    382383{
    383384    if (!fMember)
     385    {
     386        *fLog << warn << "MDataChain not valid." << endl;
    384387        return 0;
     388    }
    385389
    386390    const Double_t val = fMember->GetValue();
    … …  
    405409    case kENoop:  return val;
    406410    }
     411
     412    *fLog << warn << "No Case for " << fOperatorType << " available." << endl;
    407413
    408414    return 0;

  • trunk/MagicSoft/Mars/mdata/MDataMember.cc

    r1327 r1334  
    6868{
    6969    if (!fCall)
     70    {
     71        *fLog << err << "No TMethodCall for " << fName << " of ";
     72        *fLog << fObject->GetName() << " available... returning 0." << endl;
    7073        return 0;
     74    }
    7175
    7276    switch (fCall->ReturnType())
    … …  
    8488    default:
    8589        *fLog << err << "DataMember " << fName << " of ";
    86         *fLog << fObject->GetName() << " neither int nor float... abort." << endl;
     90        *fLog << fObject->GetName() << " neither int nor float... returning 0." << endl;
    8791        return 0;
    8892    }

  • trunk/MagicSoft/Mars/mgui/MGeomCam.cc

    r1330 r1334  
    5050//
    5151MGeomCam::MGeomCam(UInt_t npix, Float_t dist, const char *name, const char *title)
    52     : fNumPixels(npix), fCamDist(dist), fMm2Deg(kRad2Deg/(dist*1000))
     52    : fNumPixels(npix), fCamDist(dist), fConvMm2Deg(kRad2Deg/(dist*1000))
    5353{
    5454    fName  = name  ? name  : "MGeomCam";

  • trunk/MagicSoft/Mars/mgui/MGeomCam.h

    r1216 r1334  
    1818
    1919    Float_t  fCamDist;    // [m] Average distance of the camera from the mirror
    20     Float_t  fMm2Deg;    // conversion factor to convert mm in the camera plain into degrees
     20    Float_t  fConvMm2Deg; // conversion factor to convert mm in the camera plain into degrees
    2121
    2222    TObjArray *fPixels;   // Array of singel pixels storing the geometry
    … …  
    3232
    3333    Float_t GetCameraDist() const { return fCamDist; }
    34     Float_t GetConvMm2Deg() const { return fMm2Deg; }
     34    Float_t GetConvMm2Deg() const { return fConvMm2Deg; }
    3535
    3636    UInt_t  GetNumPixels() const { return fNumPixels; }

  • trunk/MagicSoft/Mars/mhist/HistLinkDef.h

    r1302 r1334  
    99#pragma link C++ class MH+;
    1010#pragma link C++ class MH3+;
     11#pragma link C++ class MHMatrix+;
    1112#pragma link C++ class MHFadcCam+;
    1213#pragma link C++ class MHFadcPix+;

  • trunk/MagicSoft/Mars/mhist/MFillH.cc

    r1330 r1334  
    313313Bool_t MFillH::PostProcess()
    314314{
     315    //
     316    // Now all data is in the histogram. Maybe some final action is
     317    // necessary.
     318    //
     319    if (!fH->Finalize())
     320    {
     321        *fLog << err << dbginf << "Error: calling Finalize for ";
     322        *fLog << fH->GetDescriptor() << "... aborting." << endl;
     323        return kFALSE;
     324    }
     325
    315326    fH->SetReadyToSave();
    316327    return kTRUE;

  • trunk/MagicSoft/Mars/mhist/MH.h

    r1300 r1334  
    2323    virtual Bool_t SetupFill(const MParList *pList) { return kTRUE; }
    2424    virtual Bool_t Fill(const MParContainer *par) = 0;
     25    virtual Bool_t Finalize() { return kTRUE; }
    2526
    2627    static TCanvas *MakeDefCanvas(TString name="", const char *title="",

  • trunk/MagicSoft/Mars/mhist/MH3.cc

    r1300 r1334  
    6767#include <TPad.h>
    6868#include <TCanvas.h>
    69 #include <TDataMember.h>
    70 #include <TMethodCall.h>
    7169
    7270#include "MLog.h"

  • trunk/MagicSoft/Mars/mhist/Makefile

    r1302 r1334  
    3232           MH.cc \
    3333           MH3.cc \
     34           MHMatrix.cc \
    3435           MHFadcPix.cc \
    3536           MHFadcCam.cc \
    … …  
    5354           MHMcEnergyImpact.cc \
    5455           MHThetabarTime.cc \
    55            MHThetabarTheta.cc \
    56            MHMcEnergyMigration.cc \
    5756           MHMcRate.cc \
    5857           MHMcIntRate.cc \
Note: See TracChangeset for help on using the changeset viewer.