Changeset 7435
- Timestamp:
- 11/29/05 14:45:13 (19 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r7432 r7435 18 18 19 19 -*-*- END OF LINE -*-*- 20 2005/11/29 Thomas Bretz 21 22 * mmain/MEventDisplay.cc: 23 - added a MContinue to be setup by mars.rc to the tasklist to 24 allow to choose events 25 26 * mars.rc: 27 - added an example how to use the new cut 28 29 30 20 31 2005/11/28 Thomas Bretz 21 32 … … 90 101 91 102 * msignal/MExtractTimeAndChargeDigitalFilter.cc 92 - fix a bug in the calculation of the high-gain times: 93 They were all shifted by the same amount "fHiGainFirst". This 94 caused an offset of usually 3 FADC slices in the times calculated 95 from high-gain and from low-gain. The bug did not have any effect 96 on the calibration runs because there, fHiGainFirst was set to 0. 97 The bug was there since 30.1.2005. 103 fixed a bug in the calculation of the high-gain times: 104 They were all shifted by the same amount "fHiGainFirst". This 105 caused an offset in the order of the position of the left border of 106 the extraction window in the times calculated from high-gain and 107 from low-gain. The bug was there since 30.1.2005. 98 108 99 109 -
trunk/MagicSoft/Mars/NEWS
r7432 r7435 49 49 trainenergy.C, traindisp.C, trainseparation.C 50 50 51 - mars: now allows to setup a cut in the resource file mars.rc to choose 52 the events to be displayed, eg: 53 Cut.Condition: {0} && {1} 54 Cut.0: MHillas.fSize>100 55 Cut.1: MHillas.fSize<900 56 51 57 - merpp: Made aware of the new .rep format 200510250. This includes 52 58 interpretation of the Receiver Board Temperatures (MCameraRecTemp), … … 55 61 written to the CC tree. 56 62 57 - callisto: fixed a bug in the calculation of the high-gain times:58 They were all shifted by the same amount "fHiGainFirst". This59 caused an offset of usually 3 FADC slices in the times calculated60 from high-gain and from low-gain. The bug did not have any effect61 on the calibration runs because there, fHiGainFirst was set to 0.62 The bug was there since 30.1.2005.63 - callisto: fixed a bug in the calculation of the arrival times in 64 the Digital Filter. They were all shifted by the same amount 65 fHiGainFirst. This caused an offset in the order of the position of 66 the left border of the extraction window in the times calculated 67 from high-gain and from low-gain. The bug effected only the absolute 68 arrival times. The bug was there since 30.1.2005. 63 69 64 70 - ganymed: ganymed.rc, ganymed_onoff.rc: -
trunk/MagicSoft/Mars/mars.rc
r7134 r7435 90 90 MImgCleanStd.CleanLevel1: 4.5 91 91 MImgCleanStd.CleanLevel2: 3.0 92 93 # ------------------------------------------------------------------------- 94 # Setup a cut to choose the events which should be displayed 95 # (Use this cuts to display only good Muon candidates) 96 # ------------------------------------------------------------------------- 97 #Cut.Inverted: Yes 98 #Cut.Condition: {0} && {1} && {2} 99 #Cut.0: MHillas.fSize>150 100 #Cut.1: (MMuonSearchPar.fRadius>180) && (MMuonSearchPar.fRadius<400) && (MMuonSearchPar.fDeviation<45) 101 #Cut.2: (MMuonCalibPar.fArcPhi>190) && (MMuonSearchPar.fDeviation<35) && (MMuonCalibPar.fArcWidth<0.20) && (MMuonCalibPar.fArcWidth>0.04) 102 -
trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
r7297 r7435 85 85 #include "MMuonSearchParCalc.h" // MMuonSearchParCalc 86 86 #include "MMuonCalibParCalc.h" // MMuonCalibParCalc 87 #include "MContinue.h" // MContinue 87 88 //#include "MMcTriggerLvl2Calc.h" // MMcTriggerLvl2Calc 88 89 … … 347 348 } 348 349 tlist->AddToList(hcalc); 350 349 351 // -------------------------------------------------- 352 // Muon Analysis 350 353 MMuonSearchParCalc *muscalc = new MMuonSearchParCalc; 351 354 MMuonCalibParCalc *mcalc = new MMuonCalibParCalc; … … 355 358 tlist->AddToList(fillmuon); 356 359 tlist->AddToList(mcalc); 360 357 361 // -------------------------------------------------- 362 // Cut to steer the display 363 MContinue *cont0=new MContinue("", "Cut"); 364 cont0->SetAllowEmpty(); 365 tlist->AddToList(cont0); 358 366 359 367 // … … 526 534 const Int_t num = reader->GetNumEntry(); 527 535 536 Int_t rc; 528 537 do 529 538 { … … 539 548 } 540 549 541 const Int_trc = tlist->Process();550 rc = tlist->Process(); 542 551 if (rc==kFALSE || rc==kERROR) 543 552 return; … … 545 554 reader->DecEventNum(); 546 555 547 } while (raw && raw->GetNumPixels()<1 && dir!=0); 556 // Define other continue conditions 557 if (raw && raw->GetNumPixels()<1) 558 rc = kCONTINUE; 559 560 } while (rc==kCONTINUE && dir!=0); 548 561 549 562 //
Note:
See TracChangeset
for help on using the changeset viewer.