Changeset 1048 for trunk


Ignore:
Timestamp:
11/07/01 11:50:28 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Makefile

    r1027 r1048  
    9797        @echo "Removing htmldoc-tree"
    9898        @rm -rf htmldoc
     99        @echo "Doing Mr.Proper in manalysis"
     100        @cd manalysis; (make mrproper > /dev/null); cd ..
    99101        @echo "Doing Mr.Proper in mbase"
    100102        @cd mbase; (make mrproper > /dev/null); cd ..
    101         @echo "Doing Mr.Proper in mraw"
    102         @cd mraw; (make mrproper > /dev/null); cd ..
    103         @echo "Doing Mr.Proper in mhist"
    104         @cd mhist; (make mrproper > /dev/null); cd ..
     103        @echo "Doing Mr.Proper in mdatacheck"
     104        @cd mdatacheck; (make mrproper > /dev/null); cd ..
     105        @echo "Doing Mr.Proper in mevtdisp"
     106        @cd meventdisp; (make mrproper > /dev/null); cd ..
    105107        @echo "Doing Mr.Proper in mfilter"
    106108        @cd mfilter; (make mrproper > /dev/null); cd ..
    107109        @echo "Doing Mr.Proper in mgui"
    108110        @cd mgui; (make mrproper > /dev/null); cd ..
    109         @echo "Doing Mr.Proper in mdatacheck"
    110         @cd mdatacheck; (make mrproper > /dev/null); cd ..
     111        @echo "Doing Mr.Proper in mhist"
     112        @cd mhist; (make mrproper > /dev/null); cd ..
     113        @echo "Doing Mr.Proper in mmain"
     114        @cd mmain; (make mrproper > /dev/null); cd ..
    111115        @echo "Doing Mr.Proper in mmc"
    112116        @cd mmc; (make mrproper > /dev/null); cd ..
    113         @echo "Doing Mr.Proper in mevtdisp"
    114         @cd meventdisp; (make mrproper > /dev/null); cd ..
    115         @echo "Doing Mr.Proper in manalysis"
    116         @cd manalysis; (make mrproper > /dev/null); cd ..
    117117        @echo "Doing Mr.Proper in mmontecarlo"
    118118        @cd mmontecarlo; (make mrproper > /dev/null); cd ..
    119         @echo "Doing Mr.Proper in mmain"
    120         @cd mmain; (make mrproper > /dev/null); cd ..
     119        @echo "Doing Mr.Proper in mraw"
     120        @cd mraw; (make mrproper > /dev/null); cd ..
    121121        @echo "Done."
    122122
  • trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc

    r1011 r1048  
    232232    // too the list with it's id, number of photons and error
    233233    //
     234    fNphot->InitSize(127);
     235
    234236    for (Int_t i = 0; i<127; i++ )
    235237    {
  • trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

    r1032 r1048  
    4545#include "MLogManip.h"
    4646
    47 #include "MRawEvtPixelIter.h"
     47#include "MRawEvtData.h"       // MRawEvtData::GetNumPixels
    4848#include "MCerPhotEvt.h"
    4949#include "MPedestalPix.h"
    5050#include "MPedestalCam.h"
     51#include "MRawEvtPixelIter.h"
    5152
    5253ClassImp(MCerPhotCalc);
     
    6566    AddToBranchList("fHiGainFadcSamples");
    6667    AddToBranchList("fLoGainFadcSamples");
    67 
    6868}
    6969
     
    108108Bool_t MCerPhotCalc::Process()
    109109{
     110    fCerPhotEvt->InitSize(fRawEvt->GetNumPixels());
     111
    110112    MRawEvtPixelIter pixel(fRawEvt);
    111 
    112113    while (pixel.Next())
    113114    {
    114 
    115115        const UInt_t pixid = pixel.GetPixelId();
    116116
  • trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

    r1032 r1048  
    4747    fTitle = title ? title : "(Number of Photon)-Event Information";
    4848
    49     fPixels = new TClonesArray ("MCerPhotPix", 577);
    50 
    51     //
    52     // FIXME: is this really necessary?
    53     //
    54     Reset();
     49    fPixels = new TClonesArray ("MCerPhotPix", 0);
    5550}
    5651
     
    8277    // TClonesArray -> 'operator new with placement' should be used
    8378
    84     fPixels->ExpandCreate(fNumPixels);
     79    //    fPixels->ExpandCreate(fNumPixels);
    8580    new ((*fPixels)[fNumPixels++]) MCerPhotPix(id, nph, err);
    8681}
     
    9388{
    9489    fNumPixels = 0;
    95 //    fPixels->Delete();
     90    fPixels->Delete();
    9691}
    9792
  • trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

    r1032 r1048  
    2222
    2323    UInt_t GetNumPixels() const { return fNumPixels; }
     24    void   InitSize(UInt_t num) { fPixels->Expand(num); }
     25
    2426    void   AddPixel(Int_t id, Float_t nph, Float_t err);
    2527
     
    3133    Float_t GetNumPhotonsMax() const;
    3234
    33     MCerPhotPix &operator[](int i)       { return *(MCerPhotPix*)(fPixels->At(i)); }
    34     MCerPhotPix &operator[](int i) const { return *(MCerPhotPix*)(fPixels->At(i)); }
     35    MCerPhotPix &operator[](int i)       { return *(MCerPhotPix*)(fPixels->UncheckedAt(i)); }
     36    MCerPhotPix &operator[](int i) const { return *(MCerPhotPix*)(fPixels->UncheckedAt(i)); }
    3537
    3638    void Reset();
  • trunk/MagicSoft/Mars/manalysis/MPedestalCam.h

    r1014 r1048  
    2323    ~MPedestalCam();
    2424
    25     void InitSize(const UInt_t i) { fArray->ExpandCreateFast(i); }
     25    void InitSize(const UInt_t i) { fArray->ExpandCreate(i); }
    2626
    27     MPedestalPix &operator[](Int_t i)       { return *(MPedestalPix*)fArray->At(i); }
    28     MPedestalPix &operator[](Int_t i) const { return *(MPedestalPix*)fArray->At(i); }
     27    MPedestalPix &operator[](Int_t i)       { return *(MPedestalPix*)fArray->UncheckedAt(i); }
     28    MPedestalPix &operator[](Int_t i) const { return *(MPedestalPix*)fArray->UncheckedAt(i); }
    2929
    3030    ClassDef(MPedestalCam, 1)   // Storage Container for all pedestal information of the camera
  • trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

    r1027 r1048  
    214214    clock.Print();
    215215
    216     *fLog << dec << endl << "CPU   - "
     216    *fLog << dec << endl << "CPU  - "
    217217        << "Time: " << clock.CpuTime() << "s"
    218218        << " for " << (maxcnt<0?dummy:maxcnt) << " Events"
    219219        << " --> " << (maxcnt<0?dummy:maxcnt)/clock.CpuTime() << " Events/s"
    220220        << endl;
    221     *fLog << "Total - "
     221    *fLog << "Real - "
    222222        << "Time: " << clock.RealTime() << "s"
    223223        << " for " << (maxcnt<0?dummy:maxcnt) << " Events"
  • trunk/MagicSoft/Mars/mgui/MGeomCam.cc

    r1027 r1048  
    3636#include "MGeomCam.h"
    3737
    38 #include <TObjArray.h>
    39 
    4038#include "MLog.h"
    4139#include "MGeomPix.h"
     
    7371{
    7472    delete fPixels;
    75 }
    76 
    77 // --------------------------------------------------------------------------
    78 //
    79 // Return the i-th pixel object
    80 //
    81 MGeomPix &MGeomCam::operator[](Int_t i)
    82 {
    83     return *(MGeomPix*)fPixels->At(i);
    84 }
    85 
    86 // --------------------------------------------------------------------------
    87 //
    88 // Return the i-th pixel object
    89 //
    90 MGeomPix &MGeomCam::operator[](Int_t i) const
    91 {
    92     return *(MGeomPix*)fPixels->At(i);
    9373}
    9474
  • trunk/MagicSoft/Mars/mgui/MGeomCam.h

    r1015 r1048  
    55#include "MParContainer.h"
    66#endif
     7#ifndef ROOT_TObjArray
     8#include "TObjArray.h"
     9#endif
    710
    811class MGeomPix;
    9 class TObjArray;
    1012
    1113class MGeomCam : public MParContainer
     
    2931    Float_t GetMaxRadius() const { return fMaxRadius; }
    3032
    31     MGeomPix &operator[](Int_t i);
    32     MGeomPix &operator[](Int_t i) const;
     33    MGeomPix &operator[](Int_t i)       { return *(MGeomPix*)fPixels->UncheckedAt(i); }
     34    MGeomPix &operator[](Int_t i) const { return *(MGeomPix*)fPixels->UncheckedAt(i); }
    3335
    3436    virtual void Print(Option_t *opt=NULL) const;
  • trunk/MagicSoft/Mars/mhist/MHHillas.cc

    r1023 r1048  
    3636    // connect all the histogram with the container fHist
    3737    //
    38     fAlpha  = new TH1F("Alpha [°]", "Alpha of Hillas",   90, 0,  90);
     38    fAlpha  = new TH1F("\\alpha [^\\circ]", "Alpha of Hillas",   90, 0,  90);
    3939    fWidth  = new TH1F("Width [mm]",  "Width of Hillas",  100, 0, 300);
    4040    fLength = new TH1F("Length [mm]", "Length of Hillas", 100, 0, 300);
Note: See TracChangeset for help on using the changeset viewer.