Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 8105) +++ /trunk/MagicSoft/Mars/Changelog (revision 8106) @@ -61,4 +61,14 @@ * mhist/MHRate.cc: - removed an obsolete debugging "Y" + + * sinope.cc, manalysis/MMcTriggerLvl2.cc, mastro/MAstroCamera.cc, + mastro/MAstroCatalog.cc, mbase/MLog.cc, mcalib/MCalibrationBlindPix.cc, + mcalib/MCalibrationChargeCalc.cc, mcalib/MCalibrationChargeCam.cc, + mcalib/MCalibrationIntensityChargeCam.cc, mfbase/MFEventSelector2.cc, + mhbase/MBinning.cc, mhbase/MH.cc, mhcalib/MHCalibrationHiLoCam.cc, + mhflux/MHFalseSource.cc, mhflux/MHThetaSqN.cc, mhist/MHCamera.[h,cc], + mimage/MNewImagePar2.cc, mmuon/MHSingleMuon.cc, + mpedestal/MPedCalcFromData.cc + - fixed warnings about shadows of parameters Index: /trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.cc (revision 8105) +++ /trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MMcTriggerLvl2.cc,v 1.14 2006-10-17 17:15:58 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -879,5 +881,5 @@ Int_t MMcTriggerLvl2::CalcBiggerCellPseudoSize() { - Int_t fMaxCell=-1; + Int_t maxcell=-1; fCellPseudoSize=0; @@ -889,5 +891,5 @@ { fCellPseudoSize = size; - fMaxCell = i; + maxcell = i; } } @@ -895,5 +897,5 @@ //*fLog << "fCellPseudoSize = " << fCellPseudoSize << " in cell N. " << fMaxCell+1 << endl; - return fMaxCell; + return maxcell; } Index: /trunk/MagicSoft/Mars/mastro/MAstroCamera.cc =================================================================== --- /trunk/MagicSoft/Mars/mastro/MAstroCamera.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mastro/MAstroCamera.cc (revision 8106) @@ -1,3 +1,5 @@ -/*====================================================================== *\ +/* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MAstroCamera.cc,v 1.30 2006-10-17 17:15:58 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -412,7 +414,7 @@ if (hasnull) { - TVector3 star(*radec); - star *= rot; - const TVector3 spot = fMirror0->GetReflection(star, fGeom->GetCameraDist())*1000; + TVector3 vstar(*radec); + vstar *= rot; + const TVector3 spot = fMirror0->GetReflection(vstar, fGeom->GetCameraDist())*1000; DrawStar(spot(0), spot(1), *radec, hasmean?kBlack:-1, Form("x=%.1fmm y=%.1fmm", mean(0), mean(1)), resize); // This can be used to get the abberation... Index: /trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc =================================================================== --- /trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.28 2006-10-17 17:15:58 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -272,7 +274,7 @@ } - Int_t add =0; - Int_t cnt =0; - Int_t line=0; + Int_t add=0; + Int_t cnt=0; + Int_t pos=0; Double_t maxmag=0; @@ -285,5 +287,5 @@ break; - line++; + pos++; if (row[0]=='#') @@ -301,5 +303,5 @@ if (name.IsNull() || r.IsNull() || d.IsNull() || m.IsNull() || epoch.IsNull()) { - gLog << warn << "Invalid Entry Line #" << line << ": " << row << endl; + gLog << warn << "Invalid Entry Line #" << pos << ": " << row << endl; continue; } Index: /trunk/MagicSoft/Mars/mbase/MLog.cc =================================================================== --- /trunk/MagicSoft/Mars/mbase/MLog.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mbase/MLog.cc (revision 8106) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.54 2006-10-17 14:11:36 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.55 2006-10-17 17:15:59 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -763,16 +763,16 @@ gErrorIgnoreLevel = 0; if (gEnv) { - TString level = gEnv->GetValue("Root.ErrorIgnoreLevel", "Info"); - if (!level.CompareTo("Info",TString::kIgnoreCase)) + TString lvl = gEnv->GetValue("Root.ErrorIgnoreLevel", "Info"); + if (!lvl.CompareTo("Info",TString::kIgnoreCase)) gErrorIgnoreLevel = kInfo; - else if (!level.CompareTo("Warning",TString::kIgnoreCase)) + else if (!lvl.CompareTo("Warning",TString::kIgnoreCase)) gErrorIgnoreLevel = kWarning; - else if (!level.CompareTo("Error",TString::kIgnoreCase)) + else if (!lvl.CompareTo("Error",TString::kIgnoreCase)) gErrorIgnoreLevel = kError; - else if (!level.CompareTo("Break",TString::kIgnoreCase)) + else if (!lvl.CompareTo("Break",TString::kIgnoreCase)) gErrorIgnoreLevel = kBreak; - else if (!level.CompareTo("SysError",TString::kIgnoreCase)) + else if (!lvl.CompareTo("SysError",TString::kIgnoreCase)) gErrorIgnoreLevel = kSysError; - else if (!level.CompareTo("Fatal",TString::kIgnoreCase)) + else if (!lvl.CompareTo("Fatal",TString::kIgnoreCase)) gErrorIgnoreLevel = kFatal; } Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationBlindPix.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationBlindPix.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationBlindPix.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MCalibrationBlindPix.cc,v 1.15 2006-10-17 17:15:59 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -375,10 +377,10 @@ { - const Float_t err = fAttErr[fColor]; - - if (err < 0.) - return -1.; - - return err*err*2.3; + const Float_t ferr = fAttErr[fColor]; + + if (ferr < 0.) + return -1.; + + return ferr*ferr*2.3; } Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.166 2006-10-17 17:15:59 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -1807,5 +1809,5 @@ MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - MCalibrationQEPix &qepix = (MCalibrationQEPix&) (*qecam) [i]; + MCalibrationQEPix &qpix = (MCalibrationQEPix&) (*qecam) [i]; MBadPixelsPix &bad = (*badcam) [i]; @@ -1818,9 +1820,9 @@ const Float_t qerelvar = avphotrelvar + pix.GetPheFFactorMethodRelVar(); - qepix.SetQEFFactor ( qe , fPulserColor ); - qepix.SetQEFFactorVar ( qerelvar*qe*qe, fPulserColor ); - qepix.SetFFactorMethodValid( kTRUE , fPulserColor ); - - if (!qepix.UpdateFFactorMethod( qecam->GetPlexiglassQE() )) + qpix.SetQEFFactor ( qe , fPulserColor ); + qpix.SetQEFFactorVar ( qerelvar*qe*qe, fPulserColor ); + qpix.SetFFactorMethodValid( kTRUE , fPulserColor ); + + if (!qpix.UpdateFFactorMethod( qecam->GetPlexiglassQE() )) *fLog << warn << GetDescriptor() << ": Cannot update Quantum efficiencies with the F-Factor Method" << endl; @@ -1949,11 +1951,11 @@ { - MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - MCalibrationQEPix &qepix = (MCalibrationQEPix&) (*qecam) [i]; - MBadPixelsPix &bad = (*badcam) [i]; + MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; + MCalibrationQEPix &qpix = (MCalibrationQEPix&) (*qecam) [i]; + MBadPixelsPix &bad = (*badcam) [i]; if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun)) { - qepix.SetFFactorMethodValid(kFALSE,fPulserColor); + qpix.SetFFactorMethodValid(kFALSE,fPulserColor); pix.SetFFactorMethodValid(kFALSE); continue; Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.69 2006-10-17 17:18:40 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -680,5 +682,5 @@ -Bool_t MCalibrationChargeCam::GetConversionFactorFFactor(Int_t ipx, Float_t &mean, Float_t &err, Float_t &ffactor) +Bool_t MCalibrationChargeCam::GetConversionFactorFFactor(Int_t ipx, Float_t &mean, Float_t &ferr, Float_t &ffactor) { @@ -691,5 +693,5 @@ mean = conv; - err = pix.GetMeanConvFADC2PheErr(); + ferr = pix.GetMeanConvFADC2PheErr(); ffactor = pix.GetMeanFFactorFADC2Phot(); Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MCalibrationIntensityChargeCam.cc,v 1.23 2006-10-17 17:15:59 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -266,11 +268,11 @@ sigerr[cnt] = pheerr; - Double_t sig = 0.; + Double_t sig1 = 0.; Double_t sig2 = 0.; Int_t num = 0; - for (Int_t i=0; iGetSize(); i++) - { - const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*cam)[i]; + for (Int_t j=0; jGetSize(); j++) + { + const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*cam)[j]; // // Don't use bad pixels @@ -280,8 +282,8 @@ // // - if (aidx != geom[i].GetAidx()) + if (aidx != geom[j].GetAidx()) continue; - sig += pix.GetConvertedMean(); + sig1 += pix.GetConvertedMean(); sig2 += pix.GetConvertedMean() * pix.GetConvertedMean(); num++; @@ -290,11 +292,11 @@ if (num > 1) { - sig /= num; - - Double_t var = (sig2 - sig*sig*num) / (num-1); - var /= sig*sig; + sig1 /= num; + + Double_t var = (sig2 - sig1*sig1*num) / (num-1); + var /= sig1*sig1; var += pherelvar; - phepersig[cnt] = phe/sig; + phepersig[cnt] = phe/sig1; if (var > 0.) phepersigerr[cnt] = TMath::Sqrt(var) * phepersig[cnt]; @@ -1057,9 +1059,9 @@ for (Int_t i=0; iGetAverageArea(0); + const MCalibrationChargePix &apix = (MCalibrationChargePix&)ccam->GetAverageArea(0); pvar = apix.GetPheFFactorMethod()/pix.GetConvertedMean(); } Index: /trunk/MagicSoft/Mars/mfbase/MFEventSelector2.cc =================================================================== --- /trunk/MagicSoft/Mars/mfbase/MFEventSelector2.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mfbase/MFEventSelector2.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MFEventSelector2.cc,v 1.10 2006-10-17 17:15:59 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -285,6 +287,6 @@ // set the nominal distribution equal to the original distribution - const Bool_t fUseOrigDist = fHistNom->GetHist().GetEntries()==0; - TH1 *hnp = fUseOrigDist ? (TH1*)(fHistOrig->GetHist()).Clone() : + const Bool_t useorigdist = fHistNom->GetHist().GetEntries()==0; + TH1 *hnp = useorigdist ? (TH1*)(fHistOrig->GetHist()).Clone() : &fHistNom->GetHist(); @@ -355,5 +357,5 @@ } - if (fUseOrigDist) + if (useorigdist) delete hnp; } Index: /trunk/MagicSoft/Mars/mhbase/MBinning.cc =================================================================== --- /trunk/MagicSoft/Mars/mhbase/MBinning.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mhbase/MBinning.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MBinning.cc,v 1.17 2006-10-17 17:16:00 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -635,5 +637,5 @@ *fLog << warn << GetDescriptor() << "::ReadEnv - WARNING: 'Edges' found... ignoring any 'NumBins', 'EdgeLo' and 'EdgeHi'" << endl; - const TString type = GetEnvValue(env, prefix, "Edges", ""); + const TString etype = GetEnvValue(env, prefix, "Edges", ""); //type = kIsUserArray; /* MISSING */ Index: /trunk/MagicSoft/Mars/mhbase/MH.cc =================================================================== --- /trunk/MagicSoft/Mars/mhbase/MH.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mhbase/MH.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.31 2006-10-17 17:16:00 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -511,10 +513,10 @@ TArrayD val(n0-1); - TArrayD err(haserr ? n0-1 : 0); + TArrayD er(haserr ? n0-1 : 0); for (int i=1; iReset(); - h2->Add(p, all->GetMaximum()); - h2->Divide(all); + h2->Add(p, hall->GetMaximum()); + h2->Divide(hall); // Delete p @@ -434,5 +436,5 @@ // range (0, fAlphaCut) // -void MHFalseSource::ProjectOn(const TH3D &src, TH2D *h3, TH2D *all) +void MHFalseSource::ProjectOn(const TH3D &src, TH2D *h3, TH2D *hall) { TAxis &axe = *src.GetZaxis(); @@ -452,6 +454,6 @@ // Move contents from projection to h3 h3->Reset(); - h3->Add(p, all->GetMaximum()); - h3->Divide(all); + h3->Add(p, hall->GetMaximum()); + h3->Divide(hall); // Delete p @@ -603,13 +605,13 @@ h->SetTitle(Form("Distribution of \\alpha for x=%.2f y=%.2f (S_{max}=%.1f\\sigma)", x, y, s)); - TH1D *h0=0; - if ((h0 = (TH1D*)gPad->FindObject("AlphaOff_z"))) + TH1D *ho=0; + if ((ho = (TH1D*)gPad->FindObject("AlphaOff_z"))) { fHistOff->ProjectionZ("AlphaOff_z", maxx, maxx, maxy, maxy); /* ============= local scaling ================ */ - const Int_t f = h0->GetXaxis()->FindFixBin(fBgMean-1.5*fAlphaCut); - const Int_t l = h0->GetXaxis()->FindFixBin(fAlphaCut*3)+f-1; - h0->Scale(h1->Integral(f, l)/h0->Integral(f, l)); + const Int_t f = ho->GetXaxis()->FindFixBin(fBgMean-1.5*fAlphaCut); + const Int_t l = ho->GetXaxis()->FindFixBin(fAlphaCut*3)+f-1; + ho->Scale(h1->Integral(f, l)/ho->Integral(f, l)); Index: /trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc =================================================================== --- /trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MHThetaSqN.cc,v 1.8 2006-10-17 17:16:00 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -282,14 +284,14 @@ // 2: 0.346 ~98% 0.260 - const Double_t dist = src0.Mod()*TMath::Sin(rad/2); - const Double_t cut = TMath::Sqrt(fFit.GetSignalIntegralMax()); - if (distmaximum) + if (MatchSector(i, sector, aidx) && (ball || IsUsed(i)) && val>maximum) maximum = val; } Index: /trunk/MagicSoft/Mars/mhist/MHCamera.h =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHCamera.h (revision 8105) +++ /trunk/MagicSoft/Mars/mhist/MHCamera.h (revision 8106) @@ -1,2 +1,5 @@ +/* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.60 2006-10-17 17:16:00 tbretz Exp $ +\* ======================================================================== */ #ifndef MARS_MHCamera #define MARS_MHCamera @@ -172,6 +175,6 @@ Stat_t GetBinError(Int_t binx, Int_t biny, Int_t binz) const { return GetBinError(binx); } - Double_t GetMinimum(Bool_t all) const { return GetMinimumSectors(TArrayI(), TArrayI(), all); } - Double_t GetMaximum(Bool_t all) const { return GetMaximumSectors(TArrayI(), TArrayI(), all); } + Double_t GetMinimum(Bool_t ball) const { return GetMinimumSectors(TArrayI(), TArrayI(), ball); } + Double_t GetMaximum(Bool_t ball) const { return GetMaximumSectors(TArrayI(), TArrayI(), ball); } Double_t GetMinimum(Double_t gt) const { return GetMinimumSectors(TArrayI(), TArrayI(), kFALSE); } // FIXME: To be done: Minimum greater than @@ -181,14 +184,14 @@ Double_t GetMaximum() const { return GetMaximum(0.0); } // FIXME: To be done: Maximum lower than - Double_t GetMinimumSector(Int_t sector, Int_t aidx, Bool_t all=kFALSE) const - { - return GetMinimumSectors(TArrayI(1, §or), TArrayI(1, &aidx), all); - } - Double_t GetMaximumSector(Int_t sector, Int_t aidx, Bool_t all=kFALSE) const - { - return GetMaximumSectors(TArrayI(1, §or), TArrayI(1, &aidx), all); - } - Double_t GetMinimumSectors(const TArrayI §or, const TArrayI &aidx, Bool_t all=kFALSE) const; - Double_t GetMaximumSectors(const TArrayI §or, const TArrayI &aidx, Bool_t all=kFALSE) const; + Double_t GetMinimumSector(Int_t sector, Int_t aidx, Bool_t ball=kFALSE) const + { + return GetMinimumSectors(TArrayI(1, §or), TArrayI(1, &aidx), ball); + } + Double_t GetMaximumSector(Int_t sector, Int_t aidx, Bool_t ball=kFALSE) const + { + return GetMaximumSectors(TArrayI(1, §or), TArrayI(1, &aidx), ball); + } + Double_t GetMinimumSectors(const TArrayI §or, const TArrayI &aidx, Bool_t ball=kFALSE) const; + Double_t GetMaximumSectors(const TArrayI §or, const TArrayI &aidx, Bool_t ball=kFALSE) const; void SetLevels(const TArrayF &arr); @@ -236,6 +239,6 @@ void AddNotify(TObject *event); - Stat_t GetMean(Bool_t all) const { return GetMeanSectors(TArrayI(), TArrayI(), all); } - Stat_t GetRMS(Bool_t all) const { return GetRmsSectors(TArrayI(), TArrayI(), all); } + Stat_t GetMean(Bool_t ball) const { return GetMeanSectors(TArrayI(), TArrayI(), ball); } + Stat_t GetRMS(Bool_t ball) const { return GetRmsSectors(TArrayI(), TArrayI(), ball); } Stat_t GetMean(Int_t=0) const { return GetMeanSectors(TArrayI(), TArrayI(), kFALSE); } @@ -245,11 +248,11 @@ Stat_t GetMedianDev() const; - Stat_t GetMeanSector(Int_t sector, Int_t aidx, Bool_t all=kFALSE) const - { - return GetMeanSectors(TArrayI(1, §or), TArrayI(1, &aidx), all); - } - Stat_t GetRmsSector(Int_t sector, Int_t aidx, Bool_t all=kFALSE) const - { - return GetRmsSectors(TArrayI(1, §or), TArrayI(1, &aidx), all); + Stat_t GetMeanSector(Int_t sector, Int_t aidx, Bool_t ball=kFALSE) const + { + return GetMeanSectors(TArrayI(1, §or), TArrayI(1, &aidx), ball); + } + Stat_t GetRmsSector(Int_t sector, Int_t aidx, Bool_t ball=kFALSE) const + { + return GetRmsSectors(TArrayI(1, §or), TArrayI(1, &aidx), ball); } Index: /trunk/MagicSoft/Mars/mimage/MNewImagePar2.cc =================================================================== --- /trunk/MagicSoft/Mars/mimage/MNewImagePar2.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mimage/MNewImagePar2.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MNewImagePar2.cc,v 1.2 2006-10-17 17:16:00 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -109,7 +111,7 @@ } - for (Int_t n=0; idx[n]>=0; n++) + for (Int_t m=0; idx[m]>=0; m++) { - const Int_t l = idx[n]; + const Int_t l = idx[m]; const MGeomPix &gpix = geom[l]; Index: /trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc =================================================================== --- /trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MHSingleMuon.cc,v 1.13 2006-10-17 17:16:00 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -289,4 +291,10 @@ } +Bool_t MHSingleMuon::AsciiWrite(ostream &out) const +{ + out << fTxtMuon;; + return kTRUE; +} + // -------------------------------------------------------------------------- // @@ -419,6 +427,6 @@ chi = f1.GetChisquare()/f1.GetNDF(); - Double_t err; - gMinuit->GetParameter(2, width, err); // get the sigma value + Double_t ferr; + gMinuit->GetParameter(2, width, ferr); // get the sigma value return kTRUE; Index: /trunk/MagicSoft/Mars/mpedestal/MPedCalcFromData.cc =================================================================== --- /trunk/MagicSoft/Mars/mpedestal/MPedCalcFromData.cc (revision 8105) +++ /trunk/MagicSoft/Mars/mpedestal/MPedCalcFromData.cc (revision 8106) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MPedCalcFromData.cc,v 1.3 2006-10-17 17:16:01 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -172,10 +174,10 @@ const ULong_t n = fWindowSizeLoGain*fDump; - const Float_t sum = fSumx.At(idx); + const Float_t sum1 = fSumx.At(idx); const Float_t sum2 = fSumx2.At(idx); - const Float_t higainped = sum/n; + const Float_t higainped = sum1/n; // 1. Calculate the Variance of the sums: - Float_t higainVar = (sum2-sum*sum/fDump)/(fDump-1.); + Float_t higainVar = (sum2-sum1*sum1/fDump)/(fDump-1.); // 2. Scale the variance to the number of slices: higainVar /= (Float_t)(fWindowSizeLoGain); Index: /trunk/MagicSoft/Mars/sinope.cc =================================================================== --- /trunk/MagicSoft/Mars/sinope.cc (revision 8105) +++ /trunk/MagicSoft/Mars/sinope.cc (revision 8106) @@ -1,2 +1,28 @@ +/* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: sinope.cc,v 1.12 2006-10-17 17:15:58 tbretz Exp $ +! -------------------------------------------------------------------------- +! +! * +! * This file is part of MARS, the MAGIC Analysis and Reconstruction +! * Software. It is distributed to you in the hope that it can be a useful +! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. +! * It is distributed WITHOUT ANY WARRANTY. +! * +! * Permission to use, copy, modify and distribute this software and its +! * documentation for any purpose is hereby granted without fee, +! * provided that the above copyright notice appear in all copies and +! * that both that copyright notice and this permission notice appear +! * in supporting documentation. It is provided "as is" without express +! * or implied warranty. +! * +! +! +! Author(s): Thomas Bretz +! Author(s): Daniela Doener +! +! Copyright: MAGIC Software Development, 2000-2006 +! +! +\* ======================================================================== */ #include #include @@ -251,7 +277,7 @@ } -static void PrintFiles(const MSequence &seq, const TString &kInpathD, Bool_t all) -{ - const char *prep = all ? "Found" : "Scheduled"; +static void PrintFiles(const MSequence &seq, const TString &kInpathD, Bool_t ball) +{ + const char *prep = ball ? "Found" : "Scheduled"; MDirIter Next; @@ -260,5 +286,5 @@ gLog << all; gLog.Separator(Form("%s Files", prep)); - Next.Print(all?"all":""); + Next.Print(ball?"all":""); gLog << endl; }