Index: /trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C =================================================================== --- /trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C (revision 3338) +++ /trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C (revision 3339) @@ -53,5 +53,5 @@ //..... MBinning *binsb = new MBinning("BinningSigmabar"); - binsb->SetEdges( 100, 0.0, 5.0); + binsb->SetEdges( 100, 0.0, 50.0); plist->AddToList(binsb); @@ -80,5 +80,5 @@ MBinning *binsdiff = new MBinning("BinningDiffsigma2"); - binsdiff->SetEdges(100, -10.0, 15.0); + binsdiff->SetEdges(100, -300.0, 500.0); plist->AddToList(binsdiff); @@ -181,6 +181,6 @@ //const char *onfile = "MCerPhot_output"; //const char *onfile = "*.ON"; - //const char *onfile = "12*.ON"; - const char *onfile = "12410.ON"; + const char *onfile = "12*.ON"; + //const char *onfile = "1238*.ON"; const char *mcfile = "/data/MAGIC/mc_eth/magLQE_3/gh/0/0/G_M0_00_0_550*.root"; @@ -191,9 +191,13 @@ // path for input for Mars //TString inPath = "/.magic/magicserv01/scratch/"; - TString inPath = "/mnt/data17a/hbartko/"; - //TString inPath = "~wittek/datacrab_feb04/"; + //TString inPath = "/mnt/data17a/hbartko/"; + //TString inPath = "~wittek/datacrab_feb04/"; + //TString inPath = "~wittek/datacrab_26feb04/"; + TString inPath = "/.magic/magicserv01/scratch/calibrated/"; + //TString inPath = "/.magic/magicserv01/scratch/David/CalibratedRuns/"; // path for output from Mars - TString outPath = "~wittek/datacrab_feb04/"; + //TString outPath = "~wittek/datacrab_feb04/"; + TString outPath = "~wittek/datacrab_26feb04/"; //----------------------------------------------- @@ -371,5 +375,5 @@ outNameImage += "Hillas"; outNameImage += typeInput; - outNameImage += "1e.root"; + outNameImage += "1.root"; gLog << "padded data to be written onto : " << outNameImage << endl; @@ -701,12 +705,24 @@ sourcefromstar.SetSourceAndStarPosition("Crab", 22, 0, 52, 5, 34, 32, "Zeta-Tau", 21, 8, 33, 5, 37, 38.7); - sourcefromstar.AddFile("~wittek/datacrab_feb04/positions.4.txt", 0); - - MBlindPixelCalc blindbeforepad; + if (typeInput == "ON") + sourcefromstar.AddFile("~wittek/datacrab_26feb04/positionsOn.4.txt", 0); + else if (typeInput == "OFF") + sourcefromstar.AddFile("~wittek/datacrab_26feb04/positionsOff.txt", 0); + + //MBlindPixelCalc blindbeforepad; //blindbeforepad.SetUseBlindPixels(); - blindbeforepad.SetName("BlindBeforePadding"); - - MBlindPixelCalc blind; + //blindbeforepad.SetName("BlindBeforePadding"); + + //MBlindPixelCalc blind; //blind.SetUseBlindPixels(); + //blind.SetUseInterpolation(); + //blind.SetName("BlindAfterPadding"); + + MSigmabarCalc sigbar; + + MBadPixelCalcRms blind; + //blind.SetUseBlindPixels(); + blind.SetUseInterpolation(); + //blind.SetCheckPedestalRMS(); blind.SetName("BlindAfterPadding"); @@ -715,6 +731,6 @@ contbasic.SetName("SelBasic"); - //MFillH fillblind("BlindPixels[MHBlindPixels]", "MBlindPixels"); - //fillblind.SetName("HBlind"); + MFillH fillblind("BlindPixels[MHBlindPixels]", "MBlindPixels"); + fillblind.SetName("HBlind"); MSigmabarCalc sigbarcalc; @@ -759,5 +775,5 @@ selstandard.SetHillasName(fHilName); selstandard.SetImgParName(fImgParName); - selstandard.SetCuts(200, 6, 600, 0.4, 1.1, 0.0, 0.0); + selstandard.SetCuts(200, 4, 600, 0.2, 1.3, 0.0, 0.0); MContinue contstandard(&selstandard); contstandard.SetName("SelStandard"); @@ -766,5 +782,5 @@ MWriteRootFile write(outNameImage); - //write.AddContainer("MRawRunHeader", "RunHeaders"); + write.AddContainer("MRawRunHeader", "RunHeaders"); //write.AddContainer("MMcRunHeader", "RunHeaders", kFALSE); //write.AddContainer("MTime", "Events"); @@ -803,9 +819,10 @@ // tliston.AddToList(&pointcorr); + tliston.AddToList(&sigbar); tliston.AddToList(&blind); tliston.AddToList(&contbasic); - //tliston.AddToList(&fillblind); - tliston.AddToList(&sigbarcalc); + tliston.AddToList(&fillblind); + //tliston.AddToList(&sigbarcalc); tliston.AddToList(&fillsigtheta); tliston.AddToList(&clean); @@ -847,5 +864,5 @@ pliston.FindObject("SigmaTheta", "MHSigmaTheta")->DrawClone(); - //pliston.FindObject("BlindPixels", "MHBlindPixels")->DrawClone(); + pliston.FindObject("BlindPixels", "MHBlindPixels")->DrawClone(); pliston.FindObject("MHHillas")->DrawClone(); @@ -855,5 +872,5 @@ pliston.FindObject("MHStarMap")->DrawClone(); - DeleteBinnings(&pliston); + //DeleteBinnings(&pliston); gLog << "End of padding" << endl; Index: /trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.cc (revision 3338) +++ /trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.cc (revision 3339) @@ -433,9 +433,9 @@ *fLog << all << "MSourcePosfromStarPos::ReInit; run = " << run << endl; - // define default values + // define default values for source position and (theta, phi) Double_t xSource_def = 51.0; Double_t ySource_def = -59.0; Double_t theta_def = 25.0; - Double_t phi_def = 0.0; + Double_t phi_def = 90.0; //------------------------------------------------------------------- Index: /trunk/MagicSoft/Mars/mhist/MHBlindPixels.cc =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHBlindPixels.cc (revision 3338) +++ /trunk/MagicSoft/Mars/mhist/MHBlindPixels.cc (revision 3339) @@ -35,4 +35,5 @@ #include "MMcEvt.hxx" #include "MBlindPixels.h" +#include "MGeomCam.h" #include "MPedPhotCam.h" #include "MParList.h" @@ -78,4 +79,11 @@ Bool_t MHBlindPixels::SetupFill(const MParList *plist) { + MGeomCam *fCam = (MGeomCam*)plist->FindObject(AddSerialNumber("MGeomCam")); + if (!fCam) + { + *fLog << err << "MHBlindPixels::SetupFill; MGeomCam not found... aborting." << endl; + return kFALSE; + } + fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt"); if (!fMcEvt) @@ -92,4 +100,5 @@ return kFALSE; } + fPedPhot->InitSize(fCam->GetNumPixels()); Index: /trunk/MagicSoft/Mars/mhist/MHBlindPixels.h =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHBlindPixels.h (revision 3338) +++ /trunk/MagicSoft/Mars/mhist/MHBlindPixels.h (revision 3339) @@ -12,10 +12,11 @@ class MMcEvt; class MParList; - +class MGeomCam; class MHBlindPixels : public MH { private: - MPedPhotCam *fPedPhot; //! + MGeomCam *fCam; //! + MPedPhotCam *fPedPhot; //! MMcEvt *fMcEvt; //! Index: /trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc =================================================================== --- /trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc (revision 3338) +++ /trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc (revision 3339) @@ -113,8 +113,16 @@ Bool_t MHSigmaTheta::SetupFill(const MParList *plist) { + fCam = (MGeomCam*)plist->FindObject("MGeomCam"); + if (!fCam) + { + *fLog << err << "MGeomCam not found (no geometry information available)... aborting." << endl; + return kFALSE; + } + fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt"); if (!fMcEvt) *fLog << warn << "MMcEvt not found... aborting." << endl; + fPed = (MPedPhotCam*)plist->FindObject("MPedPhotCam"); if (!fPed) @@ -123,11 +131,6 @@ return kFALSE; } - - fCam = (MGeomCam*)plist->FindObject("MGeomCam"); - if (!fCam) - { - *fLog << err << "MGeomCam not found (no geometry information available)... aborting." << endl; - return kFALSE; - } + fPed->InitSize(fCam->GetNumPixels()); + fEvt = (MCerPhotEvt*)plist->FindObject("MCerPhotEvt"); @@ -166,11 +169,8 @@ // Get binning for pixel number - //const UInt_t npix1 = fPed->GetSize()+1; - //*fLog << "npix1 = " << npix1 << endl; - //MBinning binspix("BinningPixel"); - //binspix.SetEdges(npix1, -0.5, npix1-0.5); - // the above gives npix1 = 1; therefore : + const UInt_t npix1 = fPed->GetSize()+1; + *fLog << "npix1 = " << npix1 << endl; MBinning binspix("BinningPixel"); - binspix.SetEdges(578, -0.5, 577.5); + binspix.SetEdges(npix1, -0.5, npix1-0.5); // Set binnings in histograms