Changeset 4225
- Timestamp:
- 05/27/04 18:02:18 (21 years ago)
- Location:
- trunk/MagicSoft/Mars/mtemp/mifae
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mtemp/mifae/Changelog
r4211 r4225 21 21 22 22 2004/05/27 Javier Rico 23 * programs/makeHillas.cc 23 * programs/makeHillas.cc, programs/makehillas.datacard 24 24 - Remove unneeded MCalibrationQECam and MBadPixelsCam objects, 25 25 trying to trace back a bug in the calibration 26 - Add possibility to interpolate bad pixels 26 27 27 28 * library/MHillasDisplay.cc -
trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc
r4218 r4225 10 10 #include "MPedestalCam.h" 11 11 #include "MBadPixelsCam.h" 12 #include "MBadPixelsTreat.h" 12 13 #include "MReadMarsFile.h" 13 14 #include "MGeomApply.h" … … 130 131 extractor.SetRange(hifirst,hilast,lofirst,lolast); 131 132 132 // MCalibrationQECam qecam;133 // MBadPixelsCam badcam;134 133 MGeomCamMagic geomcam; 135 134 MGeomApply geomapl; … … 159 158 calloop.SetExtractor(&extractor); 160 159 calloop.SetInput(&caliter); 161 // calloop.SetQECam(qecam);162 160 calloop.SetBadPixels(pedloop.GetBadPixels()); 163 161 … … 184 182 plist3.AddToList(&calloop.GetQECam()); 185 183 plist3.AddToList(&calloop.GetRelTimeCam()); 186 // plist3.AddToList(&badcam);184 plist3.AddToList(&calloop.GetBadPixels()); 187 185 plist3.AddToList(&sigcam); 188 186 plist3.AddToList(&nphot); … … 201 199 read3.DisableAutoScheme(); 202 200 203 // MExtractSignal extsig;204 // extsig.SetRange(hifirst,hilast,lofirst,lolast);205 201 MCalibrate photcalc(calMode); 206 202 MPedPhotCalc photrmscalc; … … 258 254 plist4.AddToList(&calloop.GetQECam()); 259 255 plist4.AddToList(&calloop.GetRelTimeCam()); 260 // plist4.AddToList(&badcam);256 plist4.AddToList(&calloop.GetBadPixels()); 261 257 plist4.AddToList(&nphot); 262 258 plist4.AddToList(&nphotrms); … … 274 270 read4.DisableAutoScheme(); 275 271 276 // set bad pixels277 MBlindPixelCalc blind;278 MBlindPixelCalc blind2;279 const Short_t x[16] = {330,395,329,396,389,280 323,388,322,384,385,281 386,387,321,320,319,282 394};283 const TArrayS bp(16,(Short_t*)x);284 blind.SetPixelIndices(bp);285 blind2.SetPixelIndices(bp);286 287 272 MImgCleanStd clean(lcore,ltail); 288 273 … … 291 276 MIslandCalc island; 292 277 island.SetOutputName("MIslands1"); 278 279 MBadPixelsTreat interpolatebadpixels; 280 interpolatebadpixels.SetUseInterpolation(); 293 281 294 282 MIslandClean islclean(lnew); … … 331 319 if (islflag == 2) 332 320 disphillas->SetIslandsName("MIslands2"); 333 334 321 } 335 322 … … 338 325 tlist4.AddToList(&extractor); 339 326 tlist4.AddToList(&photcalc); 340 //tlist4.AddToList(&blind); 327 if(calflag==11) 328 tlist4.AddToList(&interpolatebadpixels); 341 329 tlist4.AddToList(&clean); 342 330 … … 523 511 if(display) 524 512 cout << "Generating PS file: " << psfilename << endl; 525 cout << "Calibration flag: " << calflag << endl; 513 cout << "Calibration: "; 514 if(calflag==0) 515 cout << "Pixel area proportional intercalibration" << endl; 516 else if(calflag==-1) 517 cout << "No calibration whatsoever" << endl; 518 else if(calflag==1) 519 cout << "Default calibration" << endl; 520 else if(calflag==11) 521 cout << "Default calibration + bad pixels interpolation" << endl; 526 522 cout << "Cleaning level: ("<<lcore<<","<<ltail<<")" << endl; 527 523 if (islflag == 1 || islflag == 2) -
trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard
r4139 r4225 1 ///////////////////////////////////////////////////////// 2 // Data card template for makeHillas executable // 3 // // 4 // *** Compulsory cards are: // 5 // PRUNS, CRUNS, DRUNS, OUTFILE // 6 // // 7 // the rest are optional // 8 // *** Do NEVER add a datacard with no value after it // 9 ///////////////////////////////////////////////////////// 10 1 11 2 12 // Maximun number of (data) events to be processed) 3 NEVENTS 1013 NEVENTS 9999999 4 14 5 15 // data file directory … … 9 19 PRUNS 16743 10 20 CRUNS 16744 11 DRUNS 16745 -1676721 DRUNS 16745 12 22 13 23 // output file name … … 19 29 // Enclose all conditions between brakets, like: "(x<y) && (z<5)" 20 30 // (see MF description class for more details) 21 FILTER (MHillas.fLength<100) && (MHillas.fLength>50)31 // FILTER (MHillas.fLength<100) && (MHillas.fLength>50) 22 32 23 33 // Display flag … … 25 35 // DISPLAY 1 will show event display and produce ps file 26 36 // DISPLAY 2 will produce the ps files, no display 27 DISPLAY 037 DISPLAY 1 28 38 29 39 // PS file name … … 34 44 // 0: kNone 35 45 // 1: kDefault 36 CALFLAG 0 46 // 11: kDefault + bad pixel interpolation 47 CALFLAG 11 37 48 38 49 // Cleaning level
Note:
See TracChangeset
for help on using the changeset viewer.