Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 9316) +++ /trunk/MagicSoft/Mars/Changelog (revision 9317) @@ -55,4 +55,78 @@ - added Print - added a circle around the mirror showing fMaxR + + * mastro/MAstro.cc: + - updated some typos in comments + + * mbase/MEnv.cc: + - replaced Form by MString::Format + + * mbase/MTask.cc: + - made the total number of executions really count the total + number + + * mcalib/MCalibrationPatternDecode.cc: + - some cosmetics + - corrected the use of a wrong FindCreateObj + + * mcorsika/MCorsikaRead.cc: + - added a comment + + * mfileio/MWriteRootFile.cc: + - improved output + - improved the copy of a tree (now done without unpacking) + - made sure that copied trees are shown in the summary + - made sure that the copied trees are nevertheless deleted + + * mfilter/MFDeltaT.cc: + - adapted to change in GetNumExecutions + + * mhbase/MFillH.cc: + - set the number of executions (as it is in MTask) before the + execution + + * mhbase/MH.cc: + - improved the statistics output + + * mhist/MHCamera.[h,cc]: + - don't create an own pad anymore + - removed SetRange + - SetRange now done via MH::SetPadRange + - some sanity checks if fGeomCam is set + - some adaptions to the new layout scheme without + an own pad + - Changed DrawProjection to a more commonly usable scheme + - Removed all dependencies from MGeomCamMagic + - start the gaus fit with the maximum not the integral + + * mjobs/MJCalibrateSignal.cc: + - If the input files contain an OriginalMC tree + copy it + - consequently we make the MMcEvtBasic from the + parameter-list optional + - fixed the rule (MC files with .root as extension could not + be processed) + + * mjobs/MJCalibration.[h,cc], mjobs/MJPedestal.[h,cc]: + - Use MHCamera::CamDraw more extensively + - replace use of Form by MString::Format + + * mjobs/MJSimulation.cc: + - added an option to switch the cmaera electronics off + - write some more containers to output file (for easy access) + - set the MC bit in the header + - now use MSimMMCS to "fake" the correct file structure + - added three new writers to write the MMcEvtBasic information + - added a display of the most important things + + * mmain/MEventDisplay.cc: + - don't change into the not more existing pad of a MHCamera + + * msimcamera/MSimCalibrationSignal.cc: + - adapted GetNumExecution + - SetReadyToSave for the run header + - jitter the number of emitted photons + - corrected the emitted trigger positon + - (re)set calibration pattern Index: /trunk/MagicSoft/Mars/NEWS =================================================================== --- /trunk/MagicSoft/Mars/NEWS (revision 9316) +++ /trunk/MagicSoft/Mars/NEWS (revision 9317) @@ -41,4 +41,9 @@ * The daq event number now represents the readout number + + * The camera ''electronics'' can now be ''switched off'' + + * A new tab ''info'' now display basic things like the reflector + layout Index: /trunk/MagicSoft/Mars/mhist/MHCamera.cc =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHCamera.cc (revision 9316) +++ /trunk/MagicSoft/Mars/mhist/MHCamera.cc (revision 9317) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.115 2009-02-11 12:17:43 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.116 2009-02-11 12:25:42 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -2325,5 +2325,5 @@ } } -/* + // -------------------------------------------------------------------------- // @@ -2339,5 +2339,5 @@ obj2->Draw(); obj2->SetBit(kCanDelete); - +/* if (GetGeomCam().InheritsFrom("MGeomCamMagic")) { @@ -2375,4 +2375,5 @@ } } +*/ } @@ -2392,5 +2393,5 @@ obj2->Fit("pol0","Q",""); obj2->GetFunction("pol0")->SetLineWidth(1); - +/* if (GetGeomCam().InheritsFrom("MGeomCamMagic")) { @@ -2415,6 +2416,7 @@ } } -} */ +} + // -------------------------------------------------------------------------- // @@ -2435,5 +2437,5 @@ // void MHCamera::CamDraw(TCanvas &c, const Int_t x, const Int_t y, - const Int_t fit, /*const Int_t rad, const Int_t azi,*/ + const Int_t fit, const Int_t rad, const Int_t azi, TObject *notify) { @@ -2455,5 +2457,5 @@ Int_t cnt = 2; -/* + if (rad) { @@ -2473,5 +2475,5 @@ cnt++; } - */ + if (fit<0) return; Index: /trunk/MagicSoft/Mars/mhist/MHCamera.h =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHCamera.h (revision 9316) +++ /trunk/MagicSoft/Mars/mhist/MHCamera.h (revision 9317) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.68 2009-02-11 12:17:43 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.69 2009-02-11 12:25:42 tbretz Exp $ \* ======================================================================== */ #ifndef MARS_MHCamera @@ -230,6 +230,6 @@ TObject *DrawClone(Option_t *option="") const; void DrawProjection (Int_t fit=0) const; -// void DrawRadialProfile() const; -// void DrawAzimuthProfile() const; + void DrawRadialProfile() const; + void DrawAzimuthProfile() const; void SavePrimitive(ostream &out, Option_t *); @@ -319,5 +319,5 @@ void CamDraw(TCanvas &c, const Int_t x, const Int_t y, - const Int_t fit, /*const Int_t rad=0, const Int_t azi=0,*/ + const Int_t fit, const Int_t rad=0, const Int_t azi=0, TObject *notify=NULL); Index: /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 9316) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 9317) @@ -380,5 +380,5 @@ read->AddFiles(iter); - const TString fname(Form("s/([0-9]+(_M[12])?_[0-9.]+)_D_(.*[.])(raw([.]gz)?)$/%s\\/$1_Y_$3root/", + const TString fname(Form("s/([0-9]+(_M[12])?_[0-9.]+)_D_(.*[.])(raw|raw[.]gz|root)$/%s\\/$1_Y_$3root/", Esc(fPathOut).Data())); @@ -758,5 +758,7 @@ MWriteRootFile writemc(2, fname, fOverwrite?"RECREATE":"NEW", "Calibrated Data"); writemc.SetName("WriteMC"); - writemc.AddContainer("MMcEvtBasic", "OriginalMC"); + writemc.AddContainer("MMcEvtBasic", "OriginalMC", kFALSE); + if (fSequence.IsMonteCarlo()) + writemc.AddCopySource("OriginalMC"); // Write the special calib tree Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 9316) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 9317) @@ -19,5 +19,5 @@ ! Author(s): Markus Gaug, 02/2004 ! -! Copyright: MAGIC Software Development, 2000-2008 +! Copyright: MAGIC Software Development, 2000-2009 ! ! @@ -105,4 +105,5 @@ #include "MEnv.h" +#include "MString.h" #include "MDirIter.h" #include "MSequence.h" @@ -551,176 +552,72 @@ if (fDisplayType == kDataCheckDisplay) { + // -------------------- FitCharge ------------------- TCanvas &c1 = fDisplay->AddTab("FitCharge"); c1.Divide(3, 3); - // - // MEAN CHARGES - // - c1.cd(1); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj1=(MHCamera*)disp1.DrawCopy("hist"); - FixDataCheckHist(*obj1/*, fChargeMin, fChargeMax*/); - // DisplayReferenceLines(obj1,0); - - c1.cd(4); - gPad->SetBorderMode(0); - obj1->SetPrettyPalette(); - obj1->Draw(); - - c1.cd(7); - gPad->SetBorderMode(0); - gPad->SetTicks(); - TH1D *obj2 = (TH1D*)obj1->Projection(); - obj2->SetBit(kCanDelete); - obj2->Draw(); - FixDataCheckHist(*obj2); - //obj2->SetStats(1); - - // - // RMS per Charge - // - c1.cd(2); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj3=(MHCamera*)disp36.DrawCopy("hist"); - FixDataCheckHist(*obj3/*, 0, fChargeMax*/); - // DisplayReferenceLines(obj3,0); - - c1.cd(5); - gPad->SetBorderMode(0); - obj3->SetPrettyPalette(); - obj3->Draw(); - - c1.cd(8); - gPad->SetBorderMode(0); - if (geomcam.InheritsFrom("MGeomCamMagic")) - DisplayDoubleProject(disp36/*, "dead", "noisy"*/); - - // - // PHOTO ELECTRONS - // - c1.cd(3); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj4=(MHCamera*)disp5.DrawCopy("hist"); - FixDataCheckHist(*obj4/*, fChargeMin, fChargeMax*/); - // DisplayReferenceLines(obj3,0); - - c1.cd(6); - gPad->SetBorderMode(0); - obj4->SetPrettyPalette(); - obj4->Draw(); - - c1.cd(9); - gPad->SetBorderMode(0); - if (geomcam.InheritsFrom("MGeomCamMagic")) - DisplayDoubleProject(disp5/*, "dead", "noisy"*/); - - // - // CONVERSION FACTORS - // + disp1.CamDraw( c1, 1, 3, 6); // MEAN CHARGES + disp36.CamDraw(c1, 2, 3, 6); // RMS per Charge + disp5.CamDraw( c1, 3, 3, 6); // PHOTO ELECTRONS + + // -------------------- Conversion ------------------- + TCanvas &c2 = fDisplay->AddTab("Conversion"); c2.Divide(3,3); + disp6.SetMinMax(fConvFADC2PheMin, fConvFADC2PheMax); + disp8.SetMinMax(fQEMin, fQEMax); + disp37.SetMinMax(fConvFADC2PheMin, fConvFADC2PheMax); + + disp6.CamDraw( c2, 1, 3, 6); // CONVERSION FACTORS + disp8.CamDraw( c2, 2, 3, 6); // QUANTUM EFFICIENCY + disp37.CamDraw(c2, 3, 3, 6); // CONVERSION FADC TO PHOTONS + c2.cd(1); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj5=(MHCamera*)disp6.DrawCopy("hist"); - FixDataCheckHist(*obj5, fConvFADC2PheMin, fConvFADC2PheMax); - DisplayReferenceLines(obj5,2); - - c2.cd(4); - gPad->SetBorderMode(0); - obj5->SetPrettyPalette(); - obj5->Draw(); - - c2.cd(7); - gPad->SetBorderMode(0); - if (geomcam.InheritsFrom("MGeomCamMagic")) - DisplayDoubleProject(disp6/*, "noisy", "dead"*/); - - // - // QUANTUM EFFICIENCY - // + DisplayReferenceLines(disp6, 2); + c2.cd(2); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj6=(MHCamera*)disp8.DrawCopy("hist"); - FixDataCheckHist(*obj6, fQEMin, fQEMax); - DisplayReferenceLines(obj6,0); - - c2.cd(5); - gPad->SetBorderMode(0); - obj6->SetPrettyPalette(); - obj6->Draw(); - - c2.cd(8); - gPad->SetBorderMode(0); - if (geomcam.InheritsFrom("MGeomCamMagic")) - DisplayDoubleProject(disp8/*, "noisy", "dead"*/); - - // - // CONVERSION FADC TO PHOTONS - // + DisplayReferenceLines(disp8, 0); + c2.cd(3); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj7=(MHCamera*)disp37.DrawCopy("hist"); - FixDataCheckHist(*obj7, fConvFADC2PheMin, fConvFADC2PheMax); - DisplayReferenceLines(obj7,1); - - c2.cd(6); - gPad->SetBorderMode(0); - obj7->SetPrettyPalette(); - obj7->Draw(); - c2.cd(9); - gPad->SetBorderMode(0); - if (geomcam.InheritsFrom("MGeomCamMagic")) - DisplayDoubleProject(disp37/*, "noisy", "dead"*/); - - // - // ARRIVAL TIMES - // + DisplayReferenceLines(disp37, 1); + + // -------------------- AbsTimes ------------------- + TCanvas &c3 = fDisplay->AddTab("AbsTimes"); c3.Divide(2,3); + disp28.SetMinMax(fArrivalTimeMin, fArrivalTimeMax); + + disp28.CamDraw(c3, 1, 2, 6); // Arrival times + disp29.CamDraw(c3, 2, 2, 6); // Arrival times rms + c3.cd(1); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj10=(MHCamera*)disp28.DrawCopy("hist"); - FixDataCheckHist(*obj10, fArrivalTimeMin, fArrivalTimeMax); - DisplayReferenceLines(obj10,3); - - c3.cd(3); - gPad->SetBorderMode(0); - obj10->SetPrettyPalette(); - obj10->Draw(); - - c3.cd(5); - gPad->SetBorderMode(0); - if (geomcam.InheritsFrom("MGeomCamMagic")) - DisplayDoubleProject(disp28/*, "early", "late"*/); - - // - // ARRIVAL TIMES JITTER - // + DisplayReferenceLines(disp28, 3); + c3.cd(2); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj11=(MHCamera*)disp29.DrawCopy("hist"); - FixDataCheckHist(*obj11/*, fArrivalTimeMin, fArrivalTimeMax*/); - DisplayReferenceLines(obj11,4); - - c3.cd(4); - gPad->SetBorderMode(0); - obj11->SetPrettyPalette(); - obj11->Draw(); - - c3.cd(6); - gPad->SetBorderMode(0); - if (geomcam.InheritsFrom("MGeomCamMagic")) - DisplayDoubleProject(disp29/*, "", "jittering"*/); + DisplayReferenceLines(disp29, 4); + + if (IsRelTimes()) + { + // -------------------- RelTimes ------------------- + + TCanvas &c5 = fDisplay->AddTab("RelTimes"); + c5.Divide(2,3); + + disp30.SetMinMax(fTimeOffsetMin, fTimeOffsetMax); + disp31.SetMinMax(fTimeResolutionMin, fTimeResolutionMax); + + disp30.CamDraw(c5, 1, 2, 6); // MEAN REL. ARR. TIMES + disp31.CamDraw(c5, 2, 2, 6); // JITTER Rel. Arr. Times + + c5.cd(1); + DisplayReferenceLines(disp30, 5); + + c5.cd(2); + DisplayReferenceLines(disp31, 6); + } + + // -------------------- Unsuitable ------------------- // @@ -754,51 +651,4 @@ obj9->SetPrettyPalette(); obj9->Draw(); - - if (IsRelTimes()) - { - TCanvas &c5 = fDisplay->AddTab("RelTimes"); - c5.Divide(2,3); - - // - // MEAN REL. ARR. TIMES - // - c5.cd(1); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj12=(MHCamera*)disp30.DrawCopy("hist"); - FixDataCheckHist(*obj12, fTimeOffsetMin, fTimeOffsetMax); - DisplayReferenceLines(obj12,5); - - c5.cd(3); - gPad->SetBorderMode(0); - obj10->SetPrettyPalette(); - obj10->Draw(); - - c5.cd(5); - gPad->SetBorderMode(0); - if (geomcam.InheritsFrom("MGeomCamMagic")) - DisplayDoubleProject(disp30/*, "early", "late"*/); - - // - // JITTER Rel. Arr. Times - // - c5.cd(2); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj13=(MHCamera*)disp31.DrawCopy("hist"); - FixDataCheckHist(*obj13, fTimeResolutionMin, fTimeResolutionMax); - DisplayReferenceLines(obj13,6); - - c5.cd(4); - gPad->SetBorderMode(0); - obj13->SetPrettyPalette(); - obj13->Draw(); - - c5.cd(6); - gPad->SetBorderMode(0); - if (geomcam.InheritsFrom("MGeomCamMagic")) - DisplayDoubleProject(disp31/*, "too stable", "jittering"*/); - - } return; } @@ -989,12 +839,14 @@ } } - - -void MJCalibration::DisplayReferenceLines(const MHCamera *cam, const Int_t what) const + +void MJCalibration::DisplayReferenceLines(const MHCamera &hist, const Int_t what) const { + MHCamera *cam = dynamic_cast(gPad->FindObject(hist.GetName())); + if (!cam) + return; const MGeomCam *geom = cam->GetGeometry(); - Double_t x = geom->InheritsFrom("MGeomCamMagic") ? 397 : cam->GetNbinsX() ; + const Double_t x = geom->InheritsFrom("MGeomCamMagic") ? 397 : cam->GetNbinsX() ; TLine line; @@ -1728,4 +1580,5 @@ SetUsePINDiode(kFALSE); + // Only display result if PreProcessing was successfull const Int_t numexec = !fSequence.IsMonteCarlo() ? rawread.GetNumExecutions() : read.GetNumExecutions(); if (numexec>0) @@ -1877,10 +1730,13 @@ } + void MJCalibration::DisplayDoubleProject(const MHCamera &cam) { + const UInt_t n = cam.GetGeometry()->GetNumAreas(); + TVirtualPad *pad = gPad; - pad->Divide(2, 1, 1e-5, 1e-5);; - - for (int i=0; i<2; i++) + pad->Divide(n, 1, 1e-5, 1e-5);; + + for (UInt_t i=0; icd(i+1); @@ -1888,7 +1744,7 @@ gPad->SetTicks(); - TH1D &h = *cam.ProjectionS(TArrayI(), TArrayI(1, &i), Form("%s_%s", cam.GetName(), i==0?"Inner":"Outer")); + TH1D &h = *cam.ProjectionS(TArrayI(), TArrayI(1, (Int_t*)&i), MString::Format("%s_%d", cam.GetName(), i)); FixDataCheckHist(h); - h.SetTitle(Form("%s %s",cam.GetTitle(), i==0?"Inner":"Outer")); + h.SetTitle(MString::Format("%s %d",cam.GetTitle(), i)); h.SetDirectory(NULL); h.SetBit(kCanDelete); Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.h =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibration.h (revision 9316) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.h (revision 9317) @@ -122,5 +122,5 @@ void DisplayResult(MParList &plist); - void DisplayReferenceLines(const MHCamera *cam, const Int_t what) const; + void DisplayReferenceLines(const MHCamera &hist, const Int_t what) const; //void DisplayOutliers ( TH1D *hist, const char* whatsmall, const char* whatbig ) const; Index: /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (revision 9316) +++ /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (revision 9317) @@ -93,7 +93,4 @@ #include "MFDataMember.h" -// Display helpers -#include "MJCalibration.h" - ClassImp(MJPedestal); @@ -365,111 +362,52 @@ */ if (fDisplayType == kDisplayDataCheck) - { + { TCanvas &c3 = fDisplay->AddTab(fExtractionType!=kFundamental/*fExtractorResolution*/ ? "PedExtrd" : "Ped"); c3.Divide(2,3); + if (fExtractionType==kFundamental) + disp0.SetMinMax(fPedestalMin, fPedestalMax); + disp1.SetMinMax(fPedRmsMin, fPedRmsMax); + + disp0.CamDraw(c3, 1, 2, 0); // Don't devide, don't fit + disp1.CamDraw(c3, 2, 2, 6); // Divide, fit + c3.cd(1); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj1=(MHCamera*)disp0.DrawCopy("hist"); - // - // for the datacheck, fix the ranges!! - // - if (fExtractionType==kFundamental/*!fExtractorResolution*/) - { - obj1->SetMinimum(fPedestalMin); - obj1->SetMaximum(fPedestalMax); - } - // - // Set the datacheck sizes: - // - FixDataCheckHist((TH1D*)obj1); - // - // set reference lines - // - DisplayReferenceLines(obj1,0); - // - // end reference lines - // - c3.cd(3); - gPad->SetBorderMode(0); - obj1->SetPrettyPalette(); - obj1->Draw(); - - c3.cd(5); - gPad->SetBorderMode(0); - gPad->SetTicks(); - TH1D *obj2 = (TH1D*)obj1->Projection(); - obj2->Draw(); - obj2->SetBit(kCanDelete); - obj2->Fit("gaus","Q"); - obj2->GetFunction("gaus")->SetLineColor(kYellow); - // - // Set the datacheck sizes: - // - FixDataCheckHist(obj2); - obj2->SetStats(1); + if (fExtractionType==kFundamental) + DisplayReferenceLines(disp0, 0); c3.cd(2); - gPad->SetBorderMode(0); - gPad->SetTicks(); - MHCamera *obj3=(MHCamera*)disp1.DrawCopy("hist"); - // - // for the datacheck, fix the ranges!! - // - obj3->SetMinimum(fPedRmsMin); - obj3->SetMaximum(fPedRmsMax); - // - // Set the datacheck sizes: - // - FixDataCheckHist((TH1D*)obj3); - // - // set reference lines - // - DisplayReferenceLines(obj3,1); - - c3.cd(4); - gPad->SetBorderMode(0); - obj3->SetPrettyPalette(); - obj3->Draw(); - - c3.cd(6); - gPad->SetBorderMode(0); - - if (geomcam.InheritsFrom("MGeomCamMagic")) - { - MJCalibration::DisplayDoubleProject(disp1); - return; - } - } + DisplayReferenceLines(disp1, 1); + + return; + } if (fExtractionType!=kFundamental/*fExtractorResolution*/) - { + { TCanvas &c3 = fDisplay->AddTab(fExtractionType==kWithExtractor?"PedExtrd":"PedRndm"); c3.Divide(2,3); - disp0.CamDraw(c3, 1, 2, 1); - disp1.CamDraw(c3, 2, 2, 6); + disp0.CamDraw(c3, 1, 2, 1); // Don't divide, fit + disp1.CamDraw(c3, 2, 2, 6); // Divide, fit TCanvas &c13 = fDisplay->AddTab(fExtractionType==kWithExtractor?"DiffExtrd":"DiffRndm"); c13.Divide(2,3); - disp9.CamDraw(c13, 1, 2, 5); - disp10.CamDraw(c13, 2, 2, 5); - return; - } -} - -void MJPedestal::DisplayReferenceLines(MHCamera *cam, const Int_t what) const -{ - - Double_t x = cam->GetNbinsX(); - + disp9.CamDraw(c13, 1, 2, 1); + disp10.CamDraw(c13, 2, 2, 1); + } +} + +void MJPedestal::DisplayReferenceLines(const MHCamera &hist, const Int_t what) const +{ + MHCamera *cam = dynamic_cast(gPad->FindObject(hist.GetName())); + if (!cam) + return; + const MGeomCam *geom = cam->GetGeometry(); - if (geom->InheritsFrom("MGeomCamMagic")) - x = what ? 397 : cam->GetNbinsX(); + const Double_t x = geom->InheritsFrom("MGeomCamMagic") && what ? 397 : cam->GetNbinsX() ; TLine line; @@ -478,5 +416,5 @@ line.SetLineColor(kBlue); - TLegend *leg = new TLegend(0.6,0.75,0.9,0.99); + TLegend *leg = new TLegend(0.75,0.75,0.999,0.99); leg->SetBit(kCanDelete); @@ -522,6 +460,6 @@ - leg->AddEntry(l1, "Galactic Source","l"); - leg->AddEntry(l2, "Extra-Galactic Source","l"); + leg->AddEntry(l1, "Galactic","l"); + leg->AddEntry(l2, "Extra-Galactic","l"); leg->AddEntry(l3, "Closed Lids","l"); leg->Draw(); Index: /trunk/MagicSoft/Mars/mjobs/MJPedestal.h =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJPedestal.h (revision 9316) +++ /trunk/MagicSoft/Mars/mjobs/MJPedestal.h (revision 9317) @@ -87,5 +87,5 @@ void DisplayResult(const MParList &plist); - void DisplayReferenceLines(MHCamera *cam, const Int_t what) const; + void DisplayReferenceLines(const MHCamera &hist, const Int_t what) const; //void DisplayOutliers(TH1D *hist) const; void FixDataCheckHist(TH1D *hist) const; Index: /trunk/MagicSoft/Mars/mjobs/MJSimulation.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJSimulation.cc (revision 9316) +++ /trunk/MagicSoft/Mars/mjobs/MJSimulation.cc (revision 9317) @@ -34,4 +34,14 @@ // // +// To switch off the simulation of the camera electronics, use: +// +// Camera: Off +// +// Note, that the border of the camera and the propertied of the cones +// are still simulated (simply because it is fast). Furthermore, this +// switches off the trigger for the output, i.e. all data which deposits +// at least one photon in at least one pixel is written to the output file. +// +// // In case of a pedestal or calibration run the artificial trigger can // be "switched off" and the cosmics trrigger "switched on" by setting @@ -45,4 +55,5 @@ #include +#include // Core @@ -86,4 +97,5 @@ #include "MHn.h" +#include "MHCamera.h" #include "MHCamEvent.h" #include "MHPhotonEvent.h" @@ -95,4 +107,5 @@ #include "MParEnv.h" #include "MPulseShape.h" +#include "MGeomCam.h" #include "MPedestalCam.h" @@ -110,5 +123,5 @@ // MJSimulation::MJSimulation(const char *name, const char *title) - : fForceMode(kFALSE), fForceTrigger(kFALSE) + : fForceMode(kFALSE), fCamera(kTRUE) ,fForceTrigger(kFALSE) { fName = name ? name : "MJSimulation"; @@ -120,9 +133,10 @@ fForceMode = GetEnv("ForceMode", fForceMode); fForceTrigger = GetEnv("ForceTrigger", fForceTrigger); + fCamera = GetEnv("Camera", fCamera); return kTRUE; } -Bool_t MJSimulation::WriteResult() +Bool_t MJSimulation::WriteResult(const MParList &plist) { if (fPathOut.IsNull()) @@ -135,4 +149,9 @@ cont.Add(const_cast(GetEnv())); //cont.Add(const_cast(&fSequence)); + + cont.Add(plist.FindObject("MPulseShape")); + cont.Add(plist.FindObject("MReflector")); + cont.Add(plist.FindObject("MGeomCam")); + cont.Add(plist.FindObject("GeomAPDs")); if (fDisplay) @@ -246,26 +265,30 @@ plist.AddToList(&shape); + // *** FIXME *** FIXME *** FIXME *** + plist.FindCreateObj("MMcRunHeader"); + MRawRunHeader header; header.SetValidMagicNumber(); //header.InitFadcType(3); - header.SetRunInfo(/*MRawRunHeader::kRTMonteCarlo|*/MRawRunHeader::kRTData, 1, 1); + header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTData); if (args.GetNumArguments()==1) { if (!args.GetArgumentStr(0).CompareTo("pedestal", TString::kIgnoreCase)) { - header.SetRunInfo(/*MRawRunHeader::kRTMonteCarlo|*/MRawRunHeader::kRTPedestal, 1, 1); + header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTPedestal); header.SetSourceInfo("Pedestal"); } if (!args.GetArgumentStr(0).CompareTo("calibration", TString::kIgnoreCase)) { - header.SetRunInfo(/*MRawRunHeader::kRTMonteCarlo|*/MRawRunHeader::kRTCalibration, 1, 1); + header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTCalibration); header.SetSourceInfo("Calibration"); } if (!args.GetArgumentStr(0).CompareTo("pointrun", TString::kIgnoreCase)) - header.SetRunInfo(/*MRawRunHeader::kRTMonteCarlo|*/MRawRunHeader::kRTPointRun, 1, 1); + header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTPointRun); } // FIXME: Move to MSimPointingPos, MSimCalibrationSignal + // Can we use this as input for MSimPointingPos? header.SetObservation("On", "MonteCarlo"); plist.AddToList(&header); @@ -287,4 +310,6 @@ for (int i=0; iAddTab("Info"); + c.Divide(2,2); + + c.cd(1); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + gROOT->SetSelectedPad(0); + shape.DrawClone()->SetBit(kCanDelete); + + if (header.IsDataRun() || header.IsPointRun()) + { + c.cd(3); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + gROOT->SetSelectedPad(0); + reflector.DrawClone("line")->SetBit(kCanDelete); + + } + + if (fCamera) + { + if (dynamic_cast(env1.GetCont())) + { + c.cd(2); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + gROOT->SetSelectedPad(0); + MHCamera *c = new MHCamera(static_cast(*env1.GetCont())); + c->SetStats(kFALSE); + c->SetBit(MHCamera::kNoLegend); + c->SetBit(kCanDelete); + c->Draw(); + + } + + if (dynamic_cast(env2.GetCont())) + { + c.cd(4); + gPad->SetBorderMode(0); + gPad->SetFrameBorderMode(0); + gPad->SetGridx(); + gPad->SetGridy(); + gROOT->SetSelectedPad(0); + MHCamera *c = new MHCamera(static_cast(*env2.GetCont())); + c->SetStats(kFALSE); + c->SetBit(MHCamera::kNoLegend); + c->SetBit(kCanDelete); + c->Draw(); + } + } + } + + //------------------------------------------- // Execute first analysis @@ -607,5 +728,5 @@ //------------------------------------------- - if (!WriteResult()) + if (!WriteResult(plist)) return kFALSE; Index: /trunk/MagicSoft/Mars/mjobs/MJSimulation.h =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJSimulation.h (revision 9316) +++ /trunk/MagicSoft/Mars/mjobs/MJSimulation.h (revision 9317) @@ -8,13 +8,15 @@ class MHn; class MArgs; +class MParList; class MJSimulation : public MJob { private: - Bool_t fForceMode; // Force execution even if RUNE-section was not found + Bool_t fForceMode; // Force execution even if RUNE-section was not foundm + Bool_t fCamera; // Switch on/off camera (for fast reflector processing) Bool_t fForceTrigger; // Force the use of the trigger "electronics" - Bool_t WriteResult(); + Bool_t WriteResult(const MParList &plist); Bool_t CheckEnvLocal(); Index: /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc =================================================================== --- /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc (revision 9316) +++ /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc (revision 9317) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.67 2009-02-07 20:47:44 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.68 2009-02-11 12:31:47 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -717,5 +717,5 @@ { TCanvas *c = GetCanvas(i); - c->GetPad(1)->cd(1); + c->cd(1); TList *list = gPad->GetListOfPrimitives(); @@ -839,5 +839,5 @@ if (!o) break; - fCanvas->SetName(MString::Format("%p;%p;PixelContent", o->GetHist(), c->GetPad(1)->GetPad(1))); + fCanvas->SetName(MString::Format("%p;%p;PixelContent", o->GetHist(), c->GetPad(1))); } break; Index: /trunk/MagicSoft/Mars/mraw/MRawRunHeader.h =================================================================== --- /trunk/MagicSoft/Mars/mraw/MRawRunHeader.h (revision 9316) +++ /trunk/MagicSoft/Mars/mraw/MRawRunHeader.h (revision 9317) @@ -105,9 +105,10 @@ void InitCamera(UShort_t type, UShort_t pix=0); void InitPixels(UShort_t pix) { InitCamera((UShort_t)-1, pix); } - void SetRunInfo(UShort_t type, UShort_t tel, UInt_t run, UInt_t file=0); - void SetSourceInfo(const char src[80], char epoch='J', UShort_t date=2000); + void SetRunType(UShort_t type) { fRunType=type; } + void SetRunInfo(UShort_t tel, UInt_t run, UInt_t file=0); + void SetSourceInfo(const TString src, char epoch='J', UShort_t date=2000); void SetRunTime(const MTime &start, const MTime &end); void SetRunTimeMjd(Float_t start, Float_t stop) { fRunStart.SetMjd(start); fRunStop.SetMjd(stop); } - void SetObservation(const char mode[60], const char proj[100]); + void SetObservation(const TString mode, const TString proj); void SetNumEvents(UInt_t num); void SetValidMagicNumber() { fMagicNumber=kMagicNumber; } Index: /trunk/MagicSoft/Mars/msimcamera/MSimCalibrationSignal.cc =================================================================== --- /trunk/MagicSoft/Mars/msimcamera/MSimCalibrationSignal.cc (revision 9316) +++ /trunk/MagicSoft/Mars/msimcamera/MSimCalibrationSignal.cc (revision 9317) @@ -160,5 +160,5 @@ Bool_t MSimCalibrationSignal::CallReInit() { - if (GetNumExecutions()>0) + if (GetNumExecutions()!=1) return kTRUE; @@ -170,4 +170,6 @@ } + fRunHeader->SetReadyToSave(); + return tlist->ReInit(fParList); } @@ -190,6 +192,8 @@ for (UInt_t idx=0; idxGetNumPixels(); idx++) { + const Int_t num = TMath::Nint(gRandom->Gaus(fNumPhotons, fNumPhotons/10)); + // FIXME: How does the distribution look like? Poissonian? - for (UInt_t i=0; iAdd(cnt++); @@ -212,4 +216,6 @@ // -------------------- MSimGeomCam --------------------- + // =====> Move to MSimReadoutWindow ? + const Double_t freq = fRunHeader->GetFreqSampling()/1000.; @@ -230,5 +236,5 @@ // FIXME: Jitter! (Own class?) - fTrigger->SetVal(pp*freq); + fTrigger->SetVal((pp+pw)*freq); fTrigger->SetReadyToSave(); @@ -236,4 +242,5 @@ const UInt_t p = fRunHeader->IsCalibrationRun() ? MTriggerPattern::kCalibration : MTriggerPattern::kPedestal; fEvtHeader->SetTriggerPattern(~(p | (p<<8))); + fEvtHeader->SetCalibrationPattern(0/*BIT(16)<<16*/); // CT1 Pulser, see MCalibrationPatternDecode fEvtHeader->SetReadyToSave();