Index: trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc (revision 3345) +++ trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc (revision 3374) @@ -103,13 +103,12 @@ return kFALSE; + fPedestals = NULL; + const MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader"); if (!runheader) *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl; else - if (runheader->GetRunType() == kRTMonteCarlo) - { - fPedestals=NULL; + if (runheader->IsMonteCarloRun()) return kTRUE; - } fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam"); Index: trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc (revision 3345) +++ trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc (revision 3374) @@ -106,13 +106,12 @@ return kFALSE; + fPedestals=NULL; + const MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader"); if (!runheader) *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl; else - if (runheader->GetRunType() == kRTMonteCarlo) - { - fPedestals=NULL; + if (runheader->IsMonteCarloRun()) return kTRUE; - } fPedestals = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam"); Index: trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc (revision 3345) +++ trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc (revision 3374) @@ -154,6 +154,5 @@ } - Bool_t fIsMcFile = runheader->GetRunType() == kRTMonteCarlo; - if (!fIsMcFile) + if (!runheader->IsMonteCarloRun()) return kTRUE; Index: trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc (revision 3345) +++ trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc (revision 3374) @@ -99,5 +99,5 @@ } - return run->GetRunType() == kRTMonteCarlo; + return run->IsMonteCarloRun(); } @@ -108,38 +108,29 @@ Int_t MMcCalibrationUpdate::PreProcess(MParList *pList) { - fCalCam = (MCalibrationChargeCam*) pList->FindObject(AddSerialNumber("MCalibrationChargeCam")); - if ( !fCalCam ) - { - *fLog << inf << dbginf << AddSerialNumber("MCalibrationChargeCam") << " does not exist... Creating." << endl; - - fCalCam = (MCalibrationChargeCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationChargeCam")); - if ( !fCalCam ) - { - *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MCalibrationChargeCam") << "... aborting." << endl; - return kFALSE; - } - } - else - { - fFillCalibrationCam = kFALSE; - *fLog << inf << AddSerialNumber("MCalibrationChargeCam") << " already exists... " << endl; - } - - fPedPhotCam = (MPedPhotCam*) pList->FindCreateObj(AddSerialNumber("MPedPhotCam")); - if ( ! fPedPhotCam) - { - *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MPedPhotCam") << "... aborting." << endl; - return kFALSE; - } - - fSignalCam = (MExtractedSignalCam*) pList->FindObject(AddSerialNumber("MExtractedSignalCam")); - if ( ! fSignalCam) - { - *fLog << err << dbginf << "Cannot find " << AddSerialNumber("MExtractedSignalCam") << "... aborting." << endl; - return kFALSE; - } - - return kTRUE; - + fCalCam = (MCalibrationChargeCam*) pList->FindObject(AddSerialNumber("MCalibrationChargeCam")); + if (!fCalCam) + { + fCalCam = (MCalibrationChargeCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationChargeCam")); + if (!fCalCam) + return kFALSE; + } + else + { + fFillCalibrationCam = kFALSE; + *fLog << inf << AddSerialNumber("MCalibrationChargeCam") << " already exists... " << endl; + } + + fPedPhotCam = (MPedPhotCam*) pList->FindCreateObj(AddSerialNumber("MPedPhotCam")); + if (!fPedPhotCam) + return kFALSE; + + fSignalCam = (MExtractedSignalCam*) pList->FindObject(AddSerialNumber("MExtractedSignalCam")); + if (!fSignalCam) + { + *fLog << err << AddSerialNumber("MExtractedSignalCam") << " not found... aborting." << endl; + return kFALSE; + } + + return kTRUE; } @@ -156,24 +147,23 @@ // if (!CheckRunType(pList)) - { - *fLog << inf << "This is no MC file... skipping." << endl; + { + *fLog << inf << "This is no MC file... skipping." << endl; return kTRUE; - } + } // // Now check the existence of all necessary containers. // - fGeom = (MGeomCam*) pList->FindObject(AddSerialNumber("MGeomCam")); - if ( ! fGeom ) - { - *fLog << err << dbginf << "Cannot find " << AddSerialNumber("MGeomCam") << "... aborting." << endl; - return kFALSE; - } + if (!fGeom) + { + *fLog << err << AddSerialNumber("MGeomCam") << " not found... aborting." << endl; + return kFALSE; + } fHeaderFadc = (MMcFadcHeader*)pList->FindObject(AddSerialNumber("MMcFadcHeader")); if (!fHeaderFadc) { - *fLog << err << dbginf << AddSerialNumber("MMcFadcHeader") << " not found... aborting." << endl; + *fLog << err << AddSerialNumber("MMcFadcHeader") << " not found... aborting." << endl; return kFALSE; } @@ -182,20 +172,20 @@ // Initialize Fadc simulation parameters: // - if ( fAmplitude < 0. ) - { + if (fAmplitude < 0) + { fAmplitude = fHeaderFadc->GetAmplitud(); fAmplitudeOuter = fHeaderFadc->GetAmplitudOuter(); fConversionHiLo = fHeaderFadc->GetLow2HighGain(); - } + } else // Check that following files have all the same FADC parameters - { - if ( fabs(fHeaderFadc->GetAmplitud()-fAmplitude) > 1.e-6 || + { + if ( fabs(fHeaderFadc->GetAmplitud()-fAmplitude) > 1.e-6 || fabs(fHeaderFadc->GetAmplitudOuter()-fAmplitudeOuter) > 1.e-6 || - fabs(fConversionHiLo-fHeaderFadc->GetLow2HighGain()) > 1.e-6 ) + fabs(fConversionHiLo-fHeaderFadc->GetLow2HighGain()) > 1.e-6 ) { - *fLog << err << endl << endl << dbginf << "Parameters of MMcFadcHeader are not the same for all the read files. Aborting..." << endl << endl; - return kFALSE; - } - } + *fLog << err << "Parameters of MMcFadcHeader are not the same for all files... aborting." << endl; + return kFALSE; + } + } // @@ -205,6 +195,6 @@ // else has to be done in ReInit: // - if ( !fFillCalibrationCam ) - return kTRUE; + if (!fFillCalibrationCam) + return kTRUE; // @@ -278,11 +268,13 @@ // counts for the RMS per slice: // - - const Float_t pedestrms = sigpix.IsLoGainUsed()? - sqrt((Double_t)(fSignalCam->GetNumUsedLoGainFADCSlices())) * - (fHeaderFadc->GetPedestalRmsLow(i)>0.? fHeaderFadc->GetPedestalRmsLow(i): 0.01) - : - sqrt((Double_t)(fSignalCam->GetNumUsedHiGainFADCSlices())) * - (fHeaderFadc->GetPedestalRmsHigh(i)>0.? fHeaderFadc->GetPedestalRmsHigh(i) : 0.01); + const Double_t used = (Double_t)(sigpix.IsLoGainUsed() ? + fSignalCam->GetNumUsedLoGainFADCSlices() : + fSignalCam->GetNumUsedHiGainFADCSlices()); + + const Float_t rms0 = sigpix.IsLoGainUsed() ? + fHeaderFadc->GetPedestalRmsLow(i) : + fHeaderFadc->GetPedestalRmsHigh(i); + + const Float_t pedestrms = TMath::Sqrt(used) * (rms0>0 ? rms0 : 0.01); // @@ -297,8 +289,7 @@ if (sigpix.IsLoGainUsed()) - pedpix.Set(adc2phot*hi2lo*pedestmean, - adc2phot*hi2lo*pedestrms); + pedpix.Set(adc2phot*hi2lo*pedestmean, adc2phot*hi2lo*pedestrms); else - pedpix.Set(adc2phot*pedestmean, adc2phot*pedestrms); + pedpix.Set(adc2phot*pedestmean, adc2phot*pedestrms); } Index: trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc (revision 3345) +++ trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc (revision 3374) @@ -86,5 +86,5 @@ } - return run->GetRunType() == kRTMonteCarlo; + return run->IsMonteCarloRun(); } Index: trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc (revision 3345) +++ trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc (revision 3374) @@ -106,5 +106,5 @@ } - return runheader->GetRunType() == kRTMonteCarlo; + return runheader->IsMonteCarloRun(); } Index: trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc (revision 3345) +++ trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc (revision 3374) @@ -175,5 +175,5 @@ } else - if (runheader->GetRunType() == kRTMonteCarlo) + if (runheader->IsMonteCarloRun()) return kTRUE; Index: trunk/MagicSoft/Mars/manalysis/MPedPhotCalc.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MPedPhotCalc.cc (revision 3345) +++ trunk/MagicSoft/Mars/manalysis/MPedPhotCalc.cc (revision 3374) @@ -109,26 +109,26 @@ const MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader"); if (!runheader) - { + { *fLog << warn << dbginf; *fLog << "Warning - cannot check file type, MRawRunHeader not found." << endl; - } + } else - if (runheader->GetRunType() == kRTMonteCarlo) - return kTRUE; + if (runheader->IsMonteCarloRun()) + return kTRUE; // Initialize arrays if(fSumx.GetSize()==0) - { - const UShort_t num = fPedestals->GetSize(); + { + const UShort_t num = fPedestals->GetSize(); - fSumx.Set(num); - fSumx2.Set(num); + fSumx.Set(num); + fSumx2.Set(num); - memset(fSumx.GetArray(), 0, sizeof(Float_t)*num); - memset(fSumx2.GetArray(), 0, sizeof(Float_t)*num); - } + memset(fSumx.GetArray(), 0, sizeof(Float_t)*num); + memset(fSumx2.GetArray(), 0, sizeof(Float_t)*num); + } - return kTRUE; + return kTRUE; } @@ -140,18 +140,18 @@ Int_t MPedPhotCalc::Process() { - for(UInt_t i=0;iGetNumPixels();i++) + for(UInt_t i=0;iGetNumPixels();i++) { - const MCerPhotPix &pix = (*fCerPhot)[i]; + const MCerPhotPix &pix = (*fCerPhot)[i]; - const Float_t nphot = pix.GetNumPhotons(); - const Int_t idx = pix.GetPixId(); - - fSumx[idx] += nphot; - fSumx2[idx] += nphot*nphot; + const Float_t nphot = pix.GetNumPhotons(); + const Int_t idx = pix.GetPixId(); + + fSumx[idx] += nphot; + fSumx2[idx] += nphot*nphot; } - - fPedestals->SetReadyToSave(); - - return kTRUE; + + fPedestals->SetReadyToSave(); + + return kTRUE; } @@ -161,5 +161,5 @@ // Int_t MPedPhotCalc::PostProcess() - { +{ // Compute pedestals and rms from fSumx and fSumx2 arrays const Int_t n = GetNumExecutions(); @@ -167,14 +167,14 @@ for(Int_t i=0; i