Changeset 4613
- Timestamp:
- 08/13/04 15:36:45 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
r4612 r4613 378 378 379 379 if (fRelTimes) 380 { 381 380 { 382 381 disp30.SetCamContent(fRelTimeCam,0); 383 382 disp30.SetCamError( fRelTimeCam,1); … … 393 392 disp33.SetYTitle("[1]"); 394 393 disp34.SetYTitle("[1]"); 395 394 } 396 395 397 396 if (fDisplayType == kDataCheckDisplay) 398 397 { 399 398 400 399 TCanvas &c1 = fDisplay->AddTab("Fit.Charge"); … … 429 428 430 429 if (fRelTimes) 431 430 { 432 431 // Rel. Times 433 432 TCanvas &c5 = fDisplay->AddTab("Rel. Times"); 434 433 c5.Divide(2,4); 435 434 436 435 disp30.CamDraw(c5, 1, 2, 2); 437 436 disp31.CamDraw(c5, 2, 2, 2); 438 437 } 439 438 440 439 return; 441 442 440 } 441 443 442 if (fDisplayType == kNormalDisplay) 444 443 { 445 444 446 445 // Charges … … 500 499 501 500 if (fRelTimes) 502 501 { 503 502 // Rel. Times 504 503 TCanvas &c17 = fDisplay->AddTab("Rel. Times"); 505 504 c17.Divide(2,4); 506 505 507 506 disp30.CamDraw(c17, 1, 2, 5, 1); 508 507 disp31.CamDraw(c17, 2, 2, 5, 1); 509 508 } 510 509 511 510 return; 512 511 } 513 512 514 513 if (fDisplayType == kFullDisplay) 515 { 516 514 { 517 515 MHCalibrationCam *cam = (MHCalibrationCam*)plist.FindObject("MHCalibrationChargeCam"); 518 516 519 517 for (Int_t sector=1;sector<cam->GetAverageSectors();sector++) 520 518 { 521 519 cam->GetAverageHiGainSector(sector).DrawClone("all"); 522 520 cam->GetAverageLoGainSector(sector).DrawClone("all"); 523 521 } 524 522 525 523 // Charges 526 524 TCanvas &c21 = fDisplay->AddTab("Fit.Charge"); 527 525 c21.Divide(2, 4); 528 526 529 527 disp1.CamDraw(c21, 1, 2, 2, 1); 530 528 disp2.CamDraw(c21, 2, 2, 2, 1); 531 529 532 530 // Reduced Sigmas 533 531 TCanvas &c23 = fDisplay->AddTab("Red.Sigma"); 534 532 c23.Divide(2,4); 535 533 536 534 disp3.CamDraw(c23, 1, 2, 2, 1); 537 535 disp4.CamDraw(c23, 2, 2, 2, 1); 538 536 539 537 // F-Factor 540 538 TCanvas &c24 = fDisplay->AddTab("Phe's"); … … 598 596 599 597 if (fRelTimes) 600 598 { 601 599 // Rel. Times 602 600 TCanvas &c31 = fDisplay->AddTab("Rel. Times"); … … 617 615 618 616 for (Int_t sector=1;sector<cam->GetAverageSectors();sector++) 619 617 { 620 618 cam->GetAverageHiGainSector(sector).DrawClone("fourierevents"); 621 619 cam->GetAverageLoGainSector(sector).DrawClone("fourierevents"); 622 623 624 620 } 621 622 } 625 623 626 624 return; 627 625 } 628 626 } 629 627 … … 1038 1036 *fLog << endl; 1039 1037 1038 CheckEnv(); 1039 1040 1040 // Setup Tasklist 1041 1041 MParList plist; -
trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc
r4609 r4613 394 394 395 395 const Int_t npixels = fPedestals->GetSize(); 396 // const Int_t areas = fPedestals->GetAverageAreas();397 // const Int_t sectors = fPedestals->GetAverageSectors();398 396 399 397 if (fSumx.GetSize()==0) 400 398 { 401 399 fSumx. Set(npixels); 402 400 fSumx2.Set(npixels); 403 404 // fAreaSumx. Set(areas); 405 // fAreaSumx2.Set(areas); 406 // fAreaValid.Set(areas); 407 408 // fSectorSumx. Set(sectors); 409 // fSectorSumx2.Set(sectors); 410 // fSectorValid.Set(sectors); 411 401 412 402 fSumx.Reset(); 413 403 fSumx2.Reset(); 414 404 } 415 405 416 406 if (fWindowSizeHiGain == 0 && fWindowSizeLoGain == 0) 417 407 { 418 *fLog << err << GetDescriptor()408 *fLog << err << GetDescriptor() 419 409 << ": Number of extracted Slices is 0, abort ... " << endl; 420 return kFALSE;410 return kFALSE; 421 411 } 422 412
Note:
See TracChangeset
for help on using the changeset viewer.