Changeset 7349 for trunk/MagicSoft/Mars
- Timestamp:
- 09/12/05 16:35:04 (19 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/NEWS
r7342 r7349 8 8 * general: added a new game. Start it from the interpreter with 9 9 MagicJam j; 10 11 * callisto: MBadPixelsCalc now raises an error instead of simply stopping 12 the eventloop if something went wrong. This is necessary for the 13 automatic processing 14 15 * callisto: Fixed a bug in the treatment of times in the bad pixel 16 treatment. No neighbors have been taken into account, the new 17 arrival time was always calculated by the pixels 0 to 5. 18 19 * callisto: Fixed a bug which caused the random and peak-search pedestal 20 extracted with an extractor to be exchanged for the first (roughly) 21 500 events. (The were simple exchanged in callisto.cc) This bug might 22 have been introduced in Mars 0.9.4 when the order of calculation of the 23 two types of pedestal in callisto got exchanged. The bug only effects 24 the first seconds of data of each sequence. 10 25 11 26 -
trunk/MagicSoft/Mars/callisto.cc
r7189 r7349 598 598 599 599 // Where to search for calibration files 600 if (!job4.Process(job1.GetPedestalCam(), job 2.GetPedestalCam(), job3.GetPedestalCam()))600 if (!job4.Process(job1.GetPedestalCam(), job3.GetPedestalCam(), job2.GetPedestalCam())) 601 601 return 2; 602 602 -
trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc
r7130 r7349 137 137 // too high pedestal Rms with respect to the mean. 138 138 // 139 Bool_t MBadPixelsCalc::CheckPedestalRms(MBadPixelsPix::UnsuitableType_t type) const139 Int_t MBadPixelsCalc::CheckPedestalRms(MBadPixelsPix::UnsuitableType_t type) const 140 140 { 141 141 const Bool_t checklo = fPedestalLevelVarianceLo>0; … … 310 310 Int_t MBadPixelsCalc::Process() 311 311 { 312 return fCheckInProcess ? CheckPedestalRms(MBadPixelsPix::kUnsuitableEvt) : kTRUE; 312 if (!fCheckInProcess) 313 return kTRUE; 314 315 return CheckPedestalRms(MBadPixelsPix::kUnsuitableEvt) ? kTRUE : kERROR; 313 316 } 314 317 -
trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc
r7117 r7349 441 441 for (unsigned int j=0; j<time.GetSize(); j++) 442 442 { 443 const Double_t t = (*fEvt)[j].GetArrivalTime(); 444 if (t>=0) 443 const Int_t nn = gpix.GetNeighbor(j); 444 445 const Double_t t = (*fEvt)[nn].GetArrivalTime(); 446 if (t>=0 && !IsPixelBad(nn)) 445 447 time[n0++] = t; 446 448 } -
trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc
r7178 r7349 2045 2045 //if (!GetCanvas(c->GetName())) 2046 2046 if (!tab || c->GetName()==(TString)tab) 2047 DrawClonePad( AddTab(c->GetName()), *c);2047 DrawClonePad(c->GetName(), *c); 2048 2048 2049 2049 return kTRUE; -
trunk/MagicSoft/Mars/mbase/MStatusDisplay.h
r7001 r7349 204 204 void Update() { HandleTimer(&fTimer); HandleTimer(&fLogTimer); } 205 205 206 void DrawClonePad(const char *tab, TCanvas &oldc) 207 { 208 DrawClonePad(AddTab(tab), oldc); 209 } 210 206 211 void SetNoContextMenu(Bool_t flag=kTRUE); 207 212 -
trunk/MagicSoft/Mars/mgui/MCamEvent.cc
r4577 r7349 55 55 InitSize(geom.GetNumPixels()); 56 56 } 57 58 // -------------------------------------------------------------------------- 59 // 60 // Return the mean of all corresponding GetPixelContent 61 // 62 Double_t MCamEvent::GetCameraMean(const MGeomCam &cam, Int_t type) const 63 { 64 Int_t num = 0; 65 Double_t mean = 0; 66 for (unsigned int i=0; i<cam.GetNumPixels(); i++) 67 { 68 Double_t val; 69 if (!GetPixelContent(val, i, cam, type)) 70 continue; 71 72 mean += val; 73 num ++; 74 } 75 return num == 0 ? 0 : mean/num; 76 } -
trunk/MagicSoft/Mars/mgui/MCamEvent.h
r4577 r7349 17 17 virtual void InitSize(const UInt_t i) { } // Used by MGeomApply see Init() 18 18 19 virtual Double_t GetCameraMean(const MGeomCam &cam, Int_t type=0) const; 20 19 21 ClassDef(MCamEvent, 0) // A camera event 20 22 }; -
trunk/MagicSoft/Mars/mhflux/MHThreshold.h
r7170 r7349 15 15 { 16 16 private: 17 const MMcEvt *fMcEvt; //! P Ointer to MC energy17 const MMcEvt *fMcEvt; //! Pointer to MC energy 18 18 19 19 TH1D fHEnergy; -
trunk/MagicSoft/Mars/mhvstime/MHSectorVsTime.cc
r7223 r7349 86 86 using namespace std; 87 87 88 const TString MHSectorVsTime::gsDefName = "M SectorHVsTime";88 const TString MHSectorVsTime::gsDefName = "MHSectorVsTime"; 89 89 const TString MHSectorVsTime::gsDefTitle = "Graph of sector mean vs. time"; 90 90 -
trunk/MagicSoft/Mars/mjobs/MDataSet.cc
r7286 r7349 110 110 while (!runs.IsNull()) 111 111 { 112 TString num = runs(regexp); 112 const TString num = runs(regexp); 113 114 if (num.IsNull()) 115 { 116 *fLog << warn << "WARNING - Sequence is NaN (not a number): " << runs << endl; 117 break; 118 } 113 119 114 120 const Int_t seq = atoi(num.Data()); … … 122 128 123 129 if (i<n) 124 *fLog << warn << "WARNING - Sequence #" << seq << " alr aedy in list... skipped." << endl;130 *fLog << warn << "WARNING - Sequence #" << seq << " already in list... skipped." << endl; 125 131 else 126 132 { -
trunk/MagicSoft/Mars/mjobs/MJCut.cc
r7287 r7349 171 171 p += "/"; 172 172 p += fNameOutput.IsNull() ? Form("ganymed%08d.root", num) : fNameOutput.Data(); 173 gSystem->ExpandPathName(p); 173 174 return p; 174 175 } -
trunk/MagicSoft/Mars/mjobs/MSequence.cc
r7220 r7349 166 166 while (!runs.IsNull()) 167 167 { 168 TString num = runs(regexp); 168 const TString num = runs(regexp); 169 170 if (num.IsNull()) 171 { 172 *fLog << warn << "WARNING - Run is NaN (not a number): " << runs << endl; 173 break; 174 } 169 175 170 176 const Int_t run = atoi(num.Data()); … … 178 184 179 185 if (i<n) 180 *fLog << warn << "WARNING - Run #" << run << " alr aedy in list... skipped." << endl;186 *fLog << warn << "WARNING - Run #" << run << " already in list... skipped." << endl; 181 187 else 182 188 { -
trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc
r7223 r7349 357 357 break; 358 358 case 5: 359 val = (*this)[idx].GetRms()* TMath::Sqrt(cam.GetPixRatio(idx));359 val = (*this)[idx].GetRms()*cam.GetPixRatioSqrt(idx); 360 360 break; 361 361 default: -
trunk/MagicSoft/Mars/msignal/MSignalCam.cc
r7297 r7349 252 252 Float_t testval = pix.GetNumPhotons()/pix.GetErrorPhot(); 253 253 if (geom) 254 testval *= TMath::Sqrt(geom->GetPixRatio(i/*pix.GetPixId()*/));254 testval *= geom->GetPixRatioSqrt(i/*pix.GetPixId()*/); 255 255 256 256 if (testval < minval) … … 280 280 Float_t testval = pix.GetNumPhotons()/pix.GetErrorPhot(); 281 281 if (geom) 282 testval *= TMath::Sqrt(geom->GetPixRatio(i/*pix.GetPixId()*/));282 testval *= geom->GetPixRatioSqrt(i/*pix.GetPixId()*/); 283 283 284 284 if (testval > maxval) -
trunk/MagicSoft/Mars/msignal/MSignalCam.h
r6856 r7349 46 46 } 47 47 48 // Setter functions for use in image cleaning classes only 49 void SetSinglePixels(Short_t num, Float_t size) { fNumSinglePixels=num; fSizeSinglePixels=size; } 50 void SetNumPixelsSaturated(UInt_t hi, UInt_t lo) { fNumPixelsSaturatedHiGain=hi;fNumPixelsSaturatedLoGain=lo; } 51 48 52 // Getter functions 49 53 UInt_t GetNumPixels() const { return fPixels->GetEntriesFast(); } … … 55 59 Int_t GetNumPixelsSaturatedHiGain() const { return fNumPixelsSaturatedHiGain; } 56 60 Int_t GetNumPixelsSaturatedLoGain() const { return fNumPixelsSaturatedLoGain; } 57 58 // Setter functions for use in image cleaning classes only59 void SetSinglePixels(Short_t num, Float_t size) { fNumSinglePixels=num; fSizeSinglePixels=size; }60 void SetNumPixelsSaturated(UInt_t hi, UInt_t lo) { fNumPixelsSaturatedHiGain=hi;fNumPixelsSaturatedLoGain=lo; }61 61 62 62 Bool_t IsPixelExisting(Int_t id) const;
Note:
See TracChangeset
for help on using the changeset viewer.