Changeset 4392 for trunk/MagicSoft/Mars/mtemp
- Timestamp:
- 07/15/04 16:48:46 (20 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc
r4328 r4392 73 73 // declaration of variables read from datacards 74 74 TString outname; 75 const TString outpath = "./"; 75 76 TString idirname; 76 77 TString filter; 77 78 TString psfilename("makehillas.ps"); 79 MRunIter pedcaliter; 78 80 MRunIter caliter; 79 81 MRunIter pediter; … … 82 84 ULong_t nmaxevents= 999999999; 83 85 Short_t calflag = 1; 86 Short_t cleanflag = 1; 87 UShort_t lrings = 1; 84 88 Float_t lcore = 3.0; 85 89 Float_t ltail = 1.5; … … 131 135 { 132 136 // Set the general tasks/containers 133 MExtractFixedWindow extractor; 137 //MExtractFixedWindow extractor; 138 //extractor.SetRange(hifirst,hilast,lofirst,lolast); 139 140 MExtractSlidingWindow extractor; 134 141 extractor.SetRange(hifirst,hilast,lofirst,lolast); 135 136 // MExtractSlidingWindow extractor; 137 // extractor.SetRange(hifirst,hilast,lofirst,lolast); 138 // extractor.SetWindowSize(2,2); 142 extractor.SetWindowSize(4,4); 139 143 140 144 MGeomCamMagic geomcam; … … 149 153 //badcam.AsciiRead("badpixels.dat"); 150 154 151 MJPedestal ped loop;152 ped loop.SetInput(&pediter);153 ped loop.SetExtractor(&extractor);155 MJPedestal pedcalloop; 156 pedcalloop.SetInput(&pediter); 157 pedcalloop.SetExtractor(&extractor); 154 158 // pedloop.SetBadPixels(badcam); 155 156 if (!pedloop.Process()) 159 //pedcalloop.SetOutputPath(outpath.Data()); 160 161 162 if (!pedcalloop.Process()) 157 163 return; 158 164 … … 165 171 calloop.SetExtractor(&extractor); 166 172 calloop.SetInput(&caliter); 167 calloop.SetBadPixels(pedloop.GetBadPixels()); 168 173 calloop.SetBadPixels(pedcalloop.GetBadPixels()); 174 if(calflag==2) 175 calloop.SetUseBlindPixel(); 169 176 if(calflag>0) 170 if (!calloop.Process(ped loop.GetPedestalCam()))177 if (!calloop.Process(pedcalloop.GetPedestalCam())) 171 178 return; 172 179 … … 175 182 /* THIRD LOOP: PEDESTAL CALIBRATION INTO PHOTONS */ 176 183 /************************************************************************/ 184 // First Compute the pedestals 185 MJPedestal pedloop; 186 pedloop.SetInput(&pediter); 187 188 if (!pedloop.Process()) 189 return; 190 177 191 MParList plist3; 178 192 MTaskList tlist3; … … 279 293 280 294 MImgCleanStd clean(lcore,ltail); 295 clean.SetCleanRings(lrings); 296 MImgCleanStd::CleaningMethod_t cleanMeth= MImgCleanStd::kStandard; 297 if(cleanflag==2) 298 cleanMeth=MImgCleanStd::kDemocratic; 299 clean.SetMethod(cleanMeth); 300 281 301 MArrivalTimeCalc2 timecalc; 282 302 MIslandCalc island; … … 338 358 tlist4.AddToList(&extractor); 339 359 tlist4.AddToList(&photcalc); 340 if(calflag==11 )360 if(calflag==11 || calflag==21) 341 361 tlist4.AddToList(&interpolatebadpixels); 342 362 tlist4.AddToList(&clean); … … 428 448 } 429 449 450 // pedestal runs for calibration 451 if(strcmp(word.Data(),"PCRUNS")==0) 452 { 453 if(pedcaliter.GetNumRuns()) 454 cout << "readDataCards Warning: adding pedestal runs for calibration to the existing list" << endl; 455 ifun >> word; 456 pedcaliter.AddRuns(word.Data(),idirname.Data()); 457 } 458 430 459 // calibration runs 431 460 if(strcmp(word.Data(),"CRUNS")==0) … … 483 512 ifun >> lcore; 484 513 ifun >> ltail; 514 ifun >> lrings; 515 ifun >> cleanflag; 485 516 } 486 517 … … 536 567 else if(calflag==11) 537 568 cout << "Default calibration + bad pixels interpolation" << endl; 538 cout << "Cleaning level: ("<<lcore<<","<<ltail<<")" << endl; 569 cout << "Cleaning level: ("<<lcore<<","<<ltail<<") - " << lrings << "ring" << endl; 570 cout << "Cleaning methode: "<< cleanflag << endl; 539 571 if (islflag == 1 || islflag == 2) 540 572 cout << "Island calcultation..." << "using algorithm #" << kalgorithm <<endl;
Note:
See TracChangeset
for help on using the changeset viewer.