Changeset 2152 for trunk/MagicSoft
- Timestamp:
- 06/03/03 08:21:45 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r2150 r2152 1 1 -*-*- END OF LINE -*-*- 2 3 2003/06/03: Wolfgang Wittek 4 5 * mfileio/MCT1ReadPreProc.[h,cc] 6 - reset blind pixels for each event 7 (because they may have been changed by the padding) 8 9 * macros/ONOFFCT1Analysis.C 10 - will be the macro for the CT1 analysis using ON and OFF data 11 12 * manalysis/MPadONOFF.[h,cc] 13 - new class 14 - class for the padding of ON/OFF data 15 16 * manalysis/MPadSchweizer.[h,cc] 17 - remove fBlinds->Clear() because the resetting of the 18 blind pixels is now done in MCT1ReadPreProc 19 20 21 2 22 2003/06/02: Thomas Bretz 3 23 -
trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h
r2147 r2152 41 41 #pragma link C++ class MPadding+; 42 42 #pragma link C++ class MPadSchweizer+; 43 #pragma link C++ class MPadONOFF+; 43 44 44 45 #pragma link C++ class MCT1PointingCorrCalc+; … … 54 55 55 56 #endif 57 -
trunk/MagicSoft/Mars/manalysis/MPadSchweizer.cc
r2141 r2152 392 392 393 393 hblind = fHBlindPixIdTheta->ProjectionY("", binPix, binPix, ""); 394 fBlinds->Clear();395 394 if ( hblind->GetEntries() > 0.0 ) 396 395 for (UInt_t i=0; i<numBlind; i++) … … 774 773 775 774 //--------------------------------------------------------------- 776 TCanvas &c = *(MH::MakeDefCanvas("PadSchweizer", "", 900, 900));777 c.Divide(3, 3);775 TCanvas &c = *(MH::MakeDefCanvas("PadSchweizer", "", 900, 1200)); 776 c.Divide(3, 4); 778 777 gROOT->SetSelectedPad(NULL); 779 778 … … 801 800 fHSigmaTheta->DrawCopy(); 802 801 fHSigmaTheta->SetBit(kCanDelete); 802 803 //-------------------------------------------------------------------- 804 805 806 c.cd(7); 807 fHBlindPixNTheta->SetDirectory(NULL); 808 fHBlindPixNTheta->SetTitle("(Input) 2D : no.of blind pixels, \\Theta"); 809 fHBlindPixNTheta->DrawCopy(); 810 fHBlindPixNTheta->SetBit(kCanDelete); 811 812 //-------------------------------------------------------------------- 813 814 815 c.cd(10); 816 fHBlindPixIdTheta->SetDirectory(NULL); 817 fHBlindPixIdTheta->SetTitle("(Input) 2D : blind pixel Id, \\Theta"); 818 fHBlindPixIdTheta->DrawCopy(); 819 fHBlindPixIdTheta->SetBit(kCanDelete); 803 820 804 821 -
trunk/MagicSoft/Mars/manalysis/Makefile
r2147 r2152 23 23 # 24 24 INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \ 25 -I../mdata -I../mhist -I../mgui -I../mimage -I../mhistmc 25 -I../mdata -I../mhist -I../mgui -I../mimage -I../mhistmc \ 26 -I../mfileio 27 26 28 27 29 #------------------------------------------------------------------------------ … … 54 56 MPadding.cc \ 55 57 MPadSchweizer.cc \ 58 MPadONOFF.cc \ 56 59 MCT1PointingCorrCalc.cc \ 57 60 MParameters.cc \ -
trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc
r2141 r2152 234 234 235 235 // Boolean bdontusepix[iMAXNUMPIX]; // bdontusepix is set true if the pixel should not be used in image analysis, otherwise it is true; 236 236 237 fBlinds->Clear(); 237 238 *fLog << "Don't use pixels: "; … … 245 246 246 247 *fLog << "Exclude pixels: "; 247 248 248 // Boolean bexcludepix[iMAXNUMPIX]; 249 249 for (int i=0; i<iMAXNUMPIX; i++) … … 254 254 } 255 255 *fLog << endl; 256 257 // save blind pixels for all events of this run 258 fBlnd.Set(iMAXNUMPIX); 259 for (int i=0; i<iMAXNUMPIX; i++) 260 { 261 if ( fBlinds->IsBlind(i) ) 262 { 263 fBlnd[i] = 1; 264 } 265 else 266 { 267 fBlnd[i] = 0; 268 } 269 } 256 270 257 271 fBlinds->SetReadyToSave(); … … 881 895 */ 882 896 897 // reset blind pixels for this event 898 fBlinds->Clear(); 899 for (int i=0; i<iMAXNUMPIX; i++) 900 if ( fBlnd[i]==1 ) 901 { 902 fBlinds->SetPixelBlind(i); 903 } 904 905 // reset pedestal RMS for this event 883 906 for (Int_t i=0; i<iMAXNUMPIX; i++) 884 907 (*fPedest)[i].SetMeanRms(fPedRMS[i]); … … 1108 1131 struct eventrecord event; 1109 1132 1133 1134 1110 1135 // read the eventrecord from the file 1111 1136 fIn->read((Byte_t*)&event, sizeof(struct eventrecord)); -
trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h
r2132 r2152 4 4 #ifndef ROOT_TArrayF 5 5 #include <TArrayF.h> 6 #endif 7 8 #ifndef ROOT_TArrayI 9 #include <TArrayI.h> 6 10 #endif 7 11 … … 58 62 59 63 TArrayF fPedRMS; 64 TArrayI fBlnd; 60 65 61 66 Bool_t OpenNextFile();
Note:
See TracChangeset
for help on using the changeset viewer.