- Timestamp:
- 11/07/01 11:50:28 (23 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Makefile
r1027 r1048 97 97 @echo "Removing htmldoc-tree" 98 98 @rm -rf htmldoc 99 @echo "Doing Mr.Proper in manalysis" 100 @cd manalysis; (make mrproper > /dev/null); cd .. 99 101 @echo "Doing Mr.Proper in mbase" 100 102 @cd mbase; (make mrproper > /dev/null); cd .. 101 @echo "Doing Mr.Proper in m raw"102 @cd m raw; (make mrproper > /dev/null); cd ..103 @echo "Doing Mr.Proper in m hist"104 @cd m hist; (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 .. 105 107 @echo "Doing Mr.Proper in mfilter" 106 108 @cd mfilter; (make mrproper > /dev/null); cd .. 107 109 @echo "Doing Mr.Proper in mgui" 108 110 @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 .. 111 115 @echo "Doing Mr.Proper in mmc" 112 116 @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 ..117 117 @echo "Doing Mr.Proper in mmontecarlo" 118 118 @cd mmontecarlo; (make mrproper > /dev/null); cd .. 119 @echo "Doing Mr.Proper in m main"120 @cd m main; (make mrproper > /dev/null); cd ..119 @echo "Doing Mr.Proper in mraw" 120 @cd mraw; (make mrproper > /dev/null); cd .. 121 121 @echo "Done." 122 122 -
trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc
r1011 r1048 232 232 // too the list with it's id, number of photons and error 233 233 // 234 fNphot->InitSize(127); 235 234 236 for (Int_t i = 0; i<127; i++ ) 235 237 { -
trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc
r1032 r1048 45 45 #include "MLogManip.h" 46 46 47 #include "MRawEvt PixelIter.h"47 #include "MRawEvtData.h" // MRawEvtData::GetNumPixels 48 48 #include "MCerPhotEvt.h" 49 49 #include "MPedestalPix.h" 50 50 #include "MPedestalCam.h" 51 #include "MRawEvtPixelIter.h" 51 52 52 53 ClassImp(MCerPhotCalc); … … 65 66 AddToBranchList("fHiGainFadcSamples"); 66 67 AddToBranchList("fLoGainFadcSamples"); 67 68 68 } 69 69 … … 108 108 Bool_t MCerPhotCalc::Process() 109 109 { 110 fCerPhotEvt->InitSize(fRawEvt->GetNumPixels()); 111 110 112 MRawEvtPixelIter pixel(fRawEvt); 111 112 113 while (pixel.Next()) 113 114 { 114 115 115 const UInt_t pixid = pixel.GetPixelId(); 116 116 -
trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc
r1032 r1048 47 47 fTitle = title ? title : "(Number of Photon)-Event Information"; 48 48 49 fPixels = new TClonesArray ("MCerPhotPix", 577); 50 51 // 52 // FIXME: is this really necessary? 53 // 54 Reset(); 49 fPixels = new TClonesArray ("MCerPhotPix", 0); 55 50 } 56 51 … … 82 77 // TClonesArray -> 'operator new with placement' should be used 83 78 84 fPixels->ExpandCreate(fNumPixels);79 // fPixels->ExpandCreate(fNumPixels); 85 80 new ((*fPixels)[fNumPixels++]) MCerPhotPix(id, nph, err); 86 81 } … … 93 88 { 94 89 fNumPixels = 0; 95 //fPixels->Delete();90 fPixels->Delete(); 96 91 } 97 92 -
trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h
r1032 r1048 22 22 23 23 UInt_t GetNumPixels() const { return fNumPixels; } 24 void InitSize(UInt_t num) { fPixels->Expand(num); } 25 24 26 void AddPixel(Int_t id, Float_t nph, Float_t err); 25 27 … … 31 33 Float_t GetNumPhotonsMax() const; 32 34 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)); } 35 37 36 38 void Reset(); -
trunk/MagicSoft/Mars/manalysis/MPedestalCam.h
r1014 r1048 23 23 ~MPedestalCam(); 24 24 25 void InitSize(const UInt_t i) { fArray->ExpandCreate Fast(i); }25 void InitSize(const UInt_t i) { fArray->ExpandCreate(i); } 26 26 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); } 29 29 30 30 ClassDef(MPedestalCam, 1) // Storage Container for all pedestal information of the camera -
trunk/MagicSoft/Mars/mbase/MEvtLoop.cc
r1027 r1048 214 214 clock.Print(); 215 215 216 *fLog << dec << endl << "CPU 216 *fLog << dec << endl << "CPU - " 217 217 << "Time: " << clock.CpuTime() << "s" 218 218 << " for " << (maxcnt<0?dummy:maxcnt) << " Events" 219 219 << " --> " << (maxcnt<0?dummy:maxcnt)/clock.CpuTime() << " Events/s" 220 220 << endl; 221 *fLog << " Total - "221 *fLog << "Real - " 222 222 << "Time: " << clock.RealTime() << "s" 223 223 << " for " << (maxcnt<0?dummy:maxcnt) << " Events" -
trunk/MagicSoft/Mars/mgui/MGeomCam.cc
r1027 r1048 36 36 #include "MGeomCam.h" 37 37 38 #include <TObjArray.h>39 40 38 #include "MLog.h" 41 39 #include "MGeomPix.h" … … 73 71 { 74 72 delete fPixels; 75 }76 77 // --------------------------------------------------------------------------78 //79 // Return the i-th pixel object80 //81 MGeomPix &MGeomCam::operator[](Int_t i)82 {83 return *(MGeomPix*)fPixels->At(i);84 }85 86 // --------------------------------------------------------------------------87 //88 // Return the i-th pixel object89 //90 MGeomPix &MGeomCam::operator[](Int_t i) const91 {92 return *(MGeomPix*)fPixels->At(i);93 73 } 94 74 -
trunk/MagicSoft/Mars/mgui/MGeomCam.h
r1015 r1048 5 5 #include "MParContainer.h" 6 6 #endif 7 #ifndef ROOT_TObjArray 8 #include "TObjArray.h" 9 #endif 7 10 8 11 class MGeomPix; 9 class TObjArray;10 12 11 13 class MGeomCam : public MParContainer … … 29 31 Float_t GetMaxRadius() const { return fMaxRadius; } 30 32 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); } 33 35 34 36 virtual void Print(Option_t *opt=NULL) const; -
trunk/MagicSoft/Mars/mhist/MHHillas.cc
r1023 r1048 36 36 // connect all the histogram with the container fHist 37 37 // 38 fAlpha = new TH1F(" Alpha [°]", "Alpha of Hillas", 90, 0, 90);38 fAlpha = new TH1F("\\alpha [^\\circ]", "Alpha of Hillas", 90, 0, 90); 39 39 fWidth = new TH1F("Width [mm]", "Width of Hillas", 100, 0, 300); 40 40 fLength = new TH1F("Length [mm]", "Length of Hillas", 100, 0, 300);
Note:
See TracChangeset
for help on using the changeset viewer.