Changeset 8941
- Timestamp:
- 06/12/08 15:42:26 (17 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r8939 r8941 50 50 * msignal/MSignalCalc.cc: 51 51 - scale the pedestal correctly with the scale 52 53 * mjobs/MJStar.cc: 54 - allow filling of pyrometer information to be skipped 55 56 * mhist/MHWeather.cc: 57 - show also colored labels 58 59 * Makefile: 60 - it seems the libmars.so looses read permissions for group 61 and others when it is moved. Now they are set manually 62 63 * datacenter/fillsignal.C, datacenter/macros/fillstar.C: 64 - added filling of calibration pulse position 65 - use more often NULL in case of no entries. This is less 66 biasing in case of averaging of values 67 68 * macros/tutorials/readrfl.C: 69 - print run header 70 - print event header 71 - skip empty events 72 73 * mhist/MHEvent.cc: 74 - removed the pointing from the histogram names. It's 75 simply obsolete 76 77 * mjobs/MJSpectrum.[h,cc]: 78 - removed the kolmogorov test from output 79 - added a new tab showing the energy resolution 80 - therefore added a new BinningImpact to the list of binnings 81 - store the ganymed file's file name in the output 82 83 * mmain/MEventDisplay.cc: 84 - skip events without data in the loop not in the code. 85 This ensures that no task can crash due to this 86 when processing MCs 87 88 * mraw/MRawRunHeader.cc: 89 - the number of events in format version V9 seems to be 90 to high by one. We correct for this. 52 91 53 92 -
trunk/MagicSoft/Mars/NEWS
r8939 r8941 64 64 (Eest-Emc)/Est and the distributions (Eest-Emc)/Eest vs. Eest 65 65 and (Eest-Emc)/Emc vs Emc. 66 67 * fixed mars (event display) for merpped raw-data and MC data 66 68 67 69 ;merpp -
trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
r8632 r8941 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.6 2 2007-07-03 14:18:03tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.63 2008-06-12 14:40:21 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 235 235 tlist->AddToList(read); 236 236 237 MContinue *mcevts = new MContinue("MRawEvtData.GetNumPixels==0", "ContEmpty"); 238 if (type==2) 239 tlist->AddToList(mcevts); 240 237 241 MFEvtNumber *evtnum = new MFEvtNumber; 238 242 tlist->AddToList(evtnum); … … 607 611 MTaskList *tlist = (MTaskList*) fEvtLoop->GetTaskList(); 608 612 MGeomCam *geom = (MGeomCam*) plist->FindObject("MGeomCam"); 609 MRawEvtData *raw = (MRawEvtData*)plist->FindObject("MRawEvtData");613 //MRawEvtData *raw = (MRawEvtData*)plist->FindObject("MRawEvtData"); 610 614 611 615 // … … 637 641 638 642 // Define other continue conditions 639 if (raw && raw->GetNumPixels()<1)640 rc = kCONTINUE;643 //if (raw && raw->GetNumPixels()<1) 644 // rc = kCONTINUE; 641 645 642 646 } while (rc==kCONTINUE && dir!=0); -
trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc
r8802 r8941 484 484 485 485 if (fFormatVersion>8) 486 { 486 487 fin.read((char*)&fNumEventsRead, 4); // Total=70 488 fNumEvents--; 489 fNumEventsRead--; 490 *fLog << inf << "Format V9: Stored number of events decreased by 1." << endl; 491 } 487 492 488 493 // New in general features: (should they be included in new MAGIC1 formats, too?)
Note:
See TracChangeset
for help on using the changeset viewer.