Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 7286) +++ trunk/MagicSoft/Mars/Changelog (revision 7287) @@ -26,4 +26,25 @@ - fixed a typo in some output + * ganymed.rc, ganymed_onoff.rc, ganymed_wobble.rc: + - fixed some comments + + * macros/dohtml.C: + - updated + + * mhflux/MHDisp.cc: + - some small fixes to let the code not crash in on-only more + (still doesn't give reasonable results... maybe a fit to the + background would do it) + + * mhflux/MHFalseSource.cc: + - removed some obsolete comment + - set initial marker color of stars in star display + + * mjobs/MJCut.cc: + - added a small fix to get the correct parlist in on-only mode + + * mpointing/MSrcPosCalc.[h,cc]: + - fixed source position handling in on-only mode + @@ -102,5 +123,5 @@ * mpointing/MSrcPocCam.[h,cc]: - - fixed abug which caused problems if now source position was + - fixed a bug which caused problems if now source position was defined in the dataset. Index: trunk/MagicSoft/Mars/ganymed.rc =================================================================== --- trunk/MagicSoft/Mars/ganymed.rc (revision 7286) +++ trunk/MagicSoft/Mars/ganymed.rc (revision 7287) @@ -60,9 +60,7 @@ # ------------------------------------------------------------------------- # To get a meaningfull false source plot in wobble mode use magic cuts -# and the following two lines. Remark: You'll get worse results -# for you significance +# and the following two lines. # ------------------------------------------------------------------------- MJCut.NameHistFS: MHDisp -#Cut1.HadronnessCut: Area MHDisp.Smearing: 0.03 Index: trunk/MagicSoft/Mars/ganymed_onoff.rc =================================================================== --- trunk/MagicSoft/Mars/ganymed_onoff.rc (revision 7286) +++ trunk/MagicSoft/Mars/ganymed_onoff.rc (revision 7287) @@ -71,6 +71,5 @@ # ------------------------------------------------------------------------- # To get a meaningfull false source plot in wobble mode use magic cuts -# and the following two lines. Remark: You'll get worse results -# for you significance +# and the following two lines. # ------------------------------------------------------------------------- MJCut.NameHistFS: MHDisp Index: trunk/MagicSoft/Mars/ganymed_wobble.rc =================================================================== --- trunk/MagicSoft/Mars/ganymed_wobble.rc (revision 7286) +++ trunk/MagicSoft/Mars/ganymed_wobble.rc (revision 7287) @@ -71,6 +71,5 @@ # ------------------------------------------------------------------------- # To get a meaningfull false source plot in wobble mode use magic cuts -# and the following two lines. Remark: You'll get worse results -# for you significance +# and the following two lines. # ------------------------------------------------------------------------- MJCut.NameHistFS: MHDisp Index: trunk/MagicSoft/Mars/macros/dohtml.C =================================================================== --- trunk/MagicSoft/Mars/macros/dohtml.C (revision 7286) +++ trunk/MagicSoft/Mars/macros/dohtml.C (revision 7287) @@ -100,41 +100,41 @@ html.SetSourceDir("macros"); - html.Convert("merpp.C", "MARS - Merging and Preprocessing"); - html.Convert("tutorials/readraw.C", "MARS - How To Read A Raw"); - html.Convert("rootlogon.C", "MARS - rootlogon.C"); + html.Convert("merpp.C", "MARS - Merging and Preprocessing"); + html.Convert("tutorials/readraw.C", "MARS - How To Read A Raw"); + html.Convert("rootlogon.C", "MARS - rootlogon.C"); //html.Convert("readCT1.C", "MARS - Read and display CT1 Events"); - html.Convert("readMagic.C", "MARS - Read and display Magic Events"); + html.Convert("readMagic.C", "MARS - Read and display Magic Events"); //html.Convert("CT1Hillas.C", "MARS - Calculate CT1 Hillas"); - html.Convert("MagicHillas.C", "MARS - Calculate Magic Hillas"); + html.Convert("MagicHillas.C", "MARS - Calculate Magic Hillas"); //? html.Convert("collarea.C", "MARS - Calculate Collection Area from a MC root file"); - html.Convert("threshold.C", "MARS - Calculate Energy Threshold from a MC root file"); - html.Convert("trigrate.C", "MARS - Calculate Trigger Rate from a MC root file"); - html.Convert("star.C", "MARS - (St)andard (A)nalysis and (R)econstruction"); - html.Convert("tutorials/starplot.C", "MARS - Plot parameters from file created with star.C"); - html.Convert("tutorials/readrfl.C", "MARS - Example of reading reflector output with Mars"); - html.Convert("comprob.C", "MARS - Calculation of composite probabilities for G/H-Seperation"); - html.Convert("multidimdist.C", "MARS - Calculation of multidimensional distances for G/H-Seperation"); - html.Convert("multidimdist2.C", "MARS - Calculation of multidimensional distances for G/H-Seperation"); + html.Convert("threshold.C", "MARS - Calculate Energy Threshold from a MC root file"); + html.Convert("trigrate.C", "MARS - Calculate Trigger Rate from a MC root file"); + html.Convert("star.C", "MARS - (St)andard (A)nalysis and (R)econstruction"); + html.Convert("tutorials/starplot.C", "MARS - Plot parameters from file created with star.C"); + html.Convert("tutorials/readrfl.C", "MARS - Example of reading reflector output with Mars"); + html.Convert("comprob.C", "MARS - Calculation of composite probabilities for G/H-Seperation"); + html.Convert("multidimdist.C", "MARS - Calculation of multidimensional distances for G/H-Seperation"); + html.Convert("multidimdist2.C", "MARS - Calculation of multidimensional distances for G/H-Seperation"); // html.Convert("estimate.C", "MARS - Shows results from the energy estimation"); // html.Convert("estfit.C", "MARS - Fits the coefficients of the energy estimator MEnergyEstParam"); - html.Convert("tutorials/plot.C", "MARS - Plots 1D mars histogram"); - html.Convert("tutorials/plot2.C", "MARS - Plots a 2D mars histogram"); - html.Convert("tutorials/testenv.C", "MARS - Example to use TEnv and Mars Eventloops"); - html.Convert("triglvl2.C", "MARS - Example to use MMcTriggerLvl2 class, using filters and creating histograms"); + html.Convert("tutorials/plot.C", "MARS - Plots 1D mars histogram"); + html.Convert("tutorials/plot2.C", "MARS - Plots a 2D mars histogram"); + html.Convert("tutorials/testenv.C", "MARS - Example to use TEnv and Mars Eventloops"); + html.Convert("triglvl2.C", "MARS - Example to use MMcTriggerLvl2 class, using filters and creating histograms"); //html.Convert("status.C", "MARS - Example to use the online display"); //html.Convert("calibration.C", "MARS - Example to use the calibration"); - html.Convert("tutorials/pedvsevent.C", "MARS - Example to use MPedCalcPedRun"); + html.Convert("tutorials/pedvsevent.C", "MARS - Example to use MPedCalcPedRun"); //html.Convert("pedphotcalc.C", "MARS - Example to use MPedPhotCalc"); - html.Convert("tutorials/derotatedc.C", "MARS - Example of plotting derotated dc currents"); - html.Convert("tutorials/evtrate.C", "MARS - Example how to plot the event rate"); - html.Convert("tutorials/pixvsevent.C", "MARS - Example how to plot pixel value versus event number/time"); - html.Convert("tutorials/sectorvstime.C", "MARS - Example how to plot mean value of a camera sector versus time"); + html.Convert("tutorials/derotatedc.C", "MARS - Example of plotting derotated dc currents"); + html.Convert("tutorials/evtrate.C", "MARS - Example how to plot the event rate"); +// html.Convert("tutorials/pixvsevent.C", "MARS - Example how to plot pixel value versus event number/time"); + html.Convert("tutorials/sectorvstime.C", "MARS - Example how to plot mean value of a camera sector versus time"); html.Convert("tutorials/pedestalvstime.C", "MARS - Example how to plot pedestal/rms versus time"); - html.Convert("tutorials/pixfirerate.C", "MARS - Example how to plot the firerate of a pixel (times above threshold)"); - html.Convert("tutorials/pixsatrate.C", "MARS - Example how to plot the saturation rate of a pixel"); + html.Convert("tutorials/pixfirerate.C", "MARS - Example how to plot the firerate of a pixel (times above threshold)"); + html.Convert("tutorials/pixsatrate.C", "MARS - Example how to plot the saturation rate of a pixel"); //html.Convert("calibration.C", "MARS - Example how to use the calibrationa camera "); //html.Convert("bootcampstandardanalysis.C", "MARS - Example of the status of the standard analysis at the bootcamp"); - html.Convert("readIPR.C", "MARS - Example to read and display the IPRs from a (merpped) report file"); - html.Convert("tutorials/extendcam.C", "MARS - Example of using MGeomCamExtend and MHexagonalFTCalc"); - html.Convert("tutorials/hft.C", "MARS - Example of using MHexagonalFTCalc"); + html.Convert("readIPR.C", "MARS - Example to read and display the IPRs from a (merpped) report file"); + html.Convert("tutorials/extendcam.C", "MARS - Example of using MGeomCamExtend and MHexagonalFTCalc"); + html.Convert("tutorials/hft.C", "MARS - Example of using MHexagonalFTCalc"); } Index: trunk/MagicSoft/Mars/mhflux/MHDisp.cc =================================================================== --- trunk/MagicSoft/Mars/mhflux/MHDisp.cc (revision 7286) +++ trunk/MagicSoft/Mars/mhflux/MHDisp.cc (revision 7287) @@ -389,5 +389,5 @@ const TAxis &axey = *h2.GetYaxis(); - const Double_t rmax = fWobble ? axex.GetXmax()-0.4 : axex.GetXmax(); + const Double_t rmax = (fWobble ? axex.GetXmax()-0.4 : axex.GetXmax()) - axex.GetBinWidth(1); for (int x=1; x<=axex.GetNbins(); x++) @@ -571,20 +571,23 @@ //Profile(*h2, *h1, x0, y0); - // Replace with MAlphaFitter? - TF1 func("fcn", "gaus + [3]*x*x + [4]"); - func.SetLineWidth(1); - func.SetLineColor(kBlue); - - func.SetParLimits(2, h2->GetBinWidth(1), 1.0); - - func.SetParameter(0, h2->GetBinContent(1)); - func.FixParameter(1, 0); - func.SetParameter(2, 0.12); - if (fHistOff) - func.FixParameter(3, 0); - func.SetParameter(4, 0);//h2->GetBinContent(20)); - h2->Fit(&func, "IQ", "", 0, 1.0); - - h2->SetTitle(Form("P=(%.2f\\circ/%.2f\\circ) \\omega=%.2f\\circ f=%.2f", x0, y0, func.GetParameter(2), TMath::Abs(scale))); + if (h2->GetEntries()>0) + { + // Replace with MAlphaFitter? + TF1 func("fcn", "gaus + [3]*x*x + [4]"); + func.SetLineWidth(1); + func.SetLineColor(kBlue); + + func.SetParLimits(2, h2->GetBinWidth(1), 1.0); + + func.SetParameter(0, h2->GetBinContent(1)); + func.FixParameter(1, 0); + func.SetParameter(2, 0.12); + if (fHistOff) + func.FixParameter(3, 0); + func.SetParameter(4, 0);//h2->GetBinContent(20)); + h2->Fit(&func, "IQ", "", 0, 1.0); + + h2->SetTitle(Form("P=(%.2f\\circ/%.2f\\circ) \\omega=%.2f\\circ f=%.2f", x0, y0, func.GetParameter(2), TMath::Abs(scale))); + } } @@ -623,5 +626,5 @@ if (fHistOff) - GetCatalog()->Draw("white mirror same *"); + GetCatalog()->Draw("mirror same *"); // ----- Pad number 1 ----- @@ -643,5 +646,5 @@ if (fHistOff) - GetCatalog()->Draw("white mirror same *"); + GetCatalog()->Draw("mirror same *"); // ----- Pad number 2 ----- Index: trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc =================================================================== --- trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc (revision 7286) +++ trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc (revision 7287) @@ -227,5 +227,4 @@ // Also search for MTime, MObservatory and MPointingPos // -//MHillasExt *ext=0; Bool_t MHFalseSource::SetupFill(const MParList *plist) { @@ -236,12 +235,4 @@ return kFALSE; } - /* - ext = (MHillasExt*)plist->FindObject("MHillasExt"); - if (!ext) - { - *fLog << err << "MHillasExt not found... aborting." << endl; - return kFALSE; - } - */ fMm2Deg = geom->GetConvMm2Deg(); @@ -653,4 +644,5 @@ // Create catalog... MAstroCatalog *stars = new MAstroCatalog; + stars->SetMarkerColor(kWhite); stars->SetLimMag(9); stars->SetGuiActive(kFALSE); Index: trunk/MagicSoft/Mars/mjobs/MJCut.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCut.cc (revision 7286) +++ trunk/MagicSoft/Mars/mjobs/MJCut.cc (revision 7287) @@ -651,4 +651,10 @@ //plist.FindObject("MTimeEffectiveOnTime")->Clear(); + } + else + { + // This is the simplest way to remove the two object from the parlist + delete halphaoff; + delete hfsoff; } Index: trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc =================================================================== --- trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc (revision 7286) +++ trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc (revision 7287) @@ -168,8 +168,8 @@ if (!fSourcePos) { - *fLog << warn; + *fLog << inf; *fLog << "MSourcePos [MPointPos] not found... The source position" << endl; - *fLog << "set in MSrcPosCam (camera center if not set explicitely)" << endl; - *fLog << "will be left unchanged if not wobble mode Monte Carlo." << endl; + *fLog << "set in MSrcPosCam will be set to (0/0) or in the case" << endl; + *fLog << "of Monte Carlo set to the appropriate wobble position." << endl; return kTRUE; } @@ -278,5 +278,4 @@ v.Set(-120., 0.); - SetSrcPos(v); @@ -338,5 +337,13 @@ { if (fRunType==MRawRunHeader::kRTMonteCarlo || !fSourcePos || !fTime || !fObservatory || fMode==kOffData) - return kTRUE; + { + // If this is MC data do not change source position + if (fRunType==MRawRunHeader::kRTMonteCarlo) + return kTRUE; + + // For real data reset source position to 0/0 + SetSrcPos(); + return kTRUE; + } // Set Sky coordinates of source, taken from container "MSourcePos" Index: trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.h =================================================================== --- trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.h (revision 7286) +++ trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.h (revision 7287) @@ -45,5 +45,5 @@ // MSrcPosCalc - void SetSrcPos(TVector2 v) const; + void SetSrcPos(TVector2 v=TVector2()) const; TVector2 CalcXYinCamera(const MVector3 &pos0, const MVector3 &pos) const; TString GetRaDec(const MPointingPos &pos) const;