Changeset 8210 for trunk/MagicSoft/Mars
- Timestamp:
- 11/02/06 19:54:22 (18 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r8208 r8210 63 63 - removed obsolete SignalStartBin data members 64 64 - set last hi-gain extraction slace from 15 to 16 65 66 * mcalib/MCalibCalcFromPast.[h,cc]: 67 - some changes to the log-output 68 69 * mhcalib/MHCalibrationChargeCam.cc: 70 - reformatted some output 71 72 * mraw/MRawRunHeader.cc: 73 - reset setfill in output stream 74 75 * mimage/MNewImagePar.cc: 76 - do not take unmapped pixels into account 77 - do not start with d=max_radius^2 but with FLT_MAX 65 78 66 79 -
trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc
r8147 r8210 289 289 ReInitialize(); 290 290 291 *fLog << all << "MCalibCalcFromPast: Calibration Update..." << flush; 292 291 293 // 292 294 // Finalize Possible calibration histogram classes... 293 295 // 294 *fLog << inf << GetDescriptor() << ": Finalize calibration histograms: " << flush;296 *fLog << inf << "Finalize calibration histograms:" << endl; 295 297 296 298 // This fills the IntensityCam which are newly created by 297 299 // ReInitialize with the result of the last calib cycle 298 if (Finalize("MHCalibrationChargeCam")) *fLog << "MHCalibrationChargeCam..." << flush;299 if (Finalize("MHCalibrationChargeBlindCam")) *fLog << "MHCalibrationChargeBlindCam..." << flush;300 if (Finalize("MHCalibrationRelTimeCam")) *fLog << "MHCalibrationRelTimeCam..." << flush;300 Finalize("MHCalibrationChargeCam"); 301 Finalize("MHCalibrationChargeBlindCam"); 302 Finalize("MHCalibrationRelTimeCam"); 301 303 302 304 // … … 360 362 // - MHCalibrationCam::ResetHists() 361 363 // 362 Bool_tMCalibCalcFromPast::Finalize(const char* name, Bool_t finalize)364 void MCalibCalcFromPast::Finalize(const char* name, Bool_t finalize) 363 365 { 364 366 MHCalibrationCam *hist = (MHCalibrationCam*)fParList->FindObject(name, "MHCalibrationCam"); 365 367 if (!hist) 366 return kFALSE; 368 return; 369 370 *fLog << inf << "Finalize " << name << ":" << endl; 367 371 368 372 if (finalize) … … 370 374 371 375 hist->ResetHists(); 372 return kTRUE;373 376 } 374 377 -
trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h
r7288 r8210 69 69 // MCalibCalcFromPast 70 70 Bool_t ReInitialize(); 71 Bool_tFinalize(const char* name, Bool_t finalize=kTRUE);71 void Finalize(const char* name, Bool_t finalize=kTRUE); 72 72 73 73 Bool_t UpdateMeanPhes(); -
trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc
r8192 r8210 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.4 6 2006-11-01 15:48:31tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.47 2006-11-02 19:50:53 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 960 960 if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries()) 961 961 { 962 *fLog << warn << "Saturated Lo Gain histogram in pixel: " << i<< endl;962 *fLog << warn << "Pixel " << setw(4) << i << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl; 963 963 bad.SetUncalibrated( MBadPixelsPix::kLoGainSaturation ); 964 964 if (IsOscillations()) … … 1020 1020 if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries()) 1021 1021 { 1022 *fLog << warn << "Saturated Lo Gain histogram in area idx: " << j<< endl;1022 *fLog << warn << "Area " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl; 1023 1023 if (IsOscillations()) 1024 1024 histlo.CreateFourierSpectrum(); … … 1063 1063 if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries()) 1064 1064 { 1065 *fLog << warn << "Saturated Lo Gain histogram in sector: " << j<< endl;1065 *fLog << warn << "Sector " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl; 1066 1066 bad.SetUncalibrated( MBadPixelsPix::kLoGainSaturation ); 1067 1067 if (IsOscillations()) -
trunk/MagicSoft/Mars/mimage/MNewImagePar.cc
r7543 r8210 151 151 Float_t maxpix2 = 0; // [#phot] 152 152 153 const Double_t d = geom.GetMaxRadius()*geom.GetMaxRadius();153 const Double_t d = FLT_MAX; //geom.GetMaxRadius()*geom.GetMaxRadius(); 154 154 Double_t dist[3] = { d, d, d }; 155 155 Int_t idx[3] = { -1, -1, -1}; … … 166 166 for (UInt_t i=0; i<npix; i++) 167 167 { 168 const MSignalPix &pix = evt[i]; 169 if (pix.IsPixelUnmapped()) 170 continue; 171 168 172 // Get geometry of pixel 169 173 const MGeomPix &gpix = geom[i]; … … 201 205 } 202 206 203 const MSignalPix &pix = evt[i];204 207 if (!pix.IsPixelUsed()) 205 208 continue; -
trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc
r8005 r8210 504 504 *fLog << setfill('0') << setw(3) << (*fPixAssignment)[i] << " "; 505 505 506 *fLog << dec << endl;506 *fLog << dec << setfill(' ') << endl; 507 507 } 508 508
Note:
See TracChangeset
for help on using the changeset viewer.