Changeset 4841 for trunk/MagicSoft/Mars/mhist
- Timestamp:
- 09/03/04 14:48:31 (20 years ago)
- Location:
- trunk/MagicSoft/Mars/mhist
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mhist/HistLinkDef.h
r4463 r4841 19 19 #pragma link C++ class MHGamma+; 20 20 #pragma link C++ class MHFlux; 21 #pragma link C++ class MHSigmaTheta; 21 22 #pragma link C++ class MHEffOnTime+; 22 23 #pragma link C++ class MHTimeDiffTime+; -
trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc
r4584 r4841 44 44 #include "MBinning.h" 45 45 #include "MParList.h" 46 #include "MSigmabar.h"47 46 48 47 #include "MGeomCam.h" 49 #include "MBlindPixels.h" 48 #include "MGeomPix.h" 49 #include "MBadPixelsCam.h" 50 50 51 51 #include "MPedPhotCam.h" … … 114 114 SetBinning(&fSigmaPixTheta, &binst, &binspix, &binsb); 115 115 SetBinning(&fDiffPixTheta, &binst, &binspix, &binsd); 116 117 fNamePedPhotCam = "MPedPhotCamFromData"; 116 118 } 117 119 … … 134 136 135 137 136 fPed = (MPedPhotCam*)plist->FindObject("MPedPhotCam"); 138 139 fPed = (MPedPhotCam*)plist->FindObject(AddSerialNumber(fNamePedPhotCam), "MPedPhotCam"); 137 140 if (!fPed) 138 141 { 139 *fLog << err << "MPedPhotCam not found... aborting." << endl; 142 *fLog << err << AddSerialNumber(fNamePedPhotCam) 143 << "[MPedPhotCam] not found... aborting." << endl; 140 144 return kFALSE; 141 145 } 142 fPed->InitSize(fCam->GetNumPixels());146 //fPed->InitSize(fCam->GetNumPixels()); 143 147 144 148 145 fB lindPix = (MBlindPixels*)plist->FindObject("MBlindPixels");146 if (!fB lindPix)149 fBad = (MBadPixelsCam*)plist->FindObject("MBadPixelsCam"); 150 if (!fBad) 147 151 { 148 *fLog << err << "MB lindPixelsnot found... continue. " << endl;152 *fLog << err << "MBadPixelsCam not found... continue. " << endl; 149 153 } 150 154 … … 157 161 } 158 162 159 fSigmabar = (MSigmabar*)plist->FindObject("MSigmabar");160 if (!fSigmabar)161 {162 *fLog << err << "MSigmabar not found... aborting." << endl;163 return kFALSE;164 }165 163 166 164 // Get Theta Binning … … 213 211 { 214 212 Double_t theta = fPointPos->GetZd(); 215 fSigmabar->Calc(*fCam, *fPed, *fEvt); 216 Double_t mysig = fSigmabar->GetSigmabarInner();217 Double_t mysigouter = fSigmabar->GetSigmabarOuter();218 219 //*fLog << "theta, mysig, mysigouter = " << theta << ", " << mysig220 //<< ", " << mysigouter << endl;213 214 Double_t mysig = (fPed->GetArea(0)).GetRms(); 215 Double_t mysigouter = (fPed->GetArea(1)).GetRms(); 216 217 *fLog << "theta, mysig, mysigouter = " << theta << ", " << mysig 218 << ", " << mysigouter << endl; 221 219 222 220 fSigmaTheta.Fill(theta, mysig); … … 239 237 const MPedPhotPix &pix = (*fPed)[id]; 240 238 241 if ( fB lindPix != NULL && fBlindPix->IsBlind(id) )239 if ( fBad != NULL && ((*fBad)[id]).IsUnsuitable() ) 242 240 { 243 // this should never occur, because b lind pixels should have244 // been set unused by MBlindPixelsCalc2::UnMap()245 //*fLog << all << "MHSigmaTheta::Fill; blind pixel found which is used, id = "246 //<< id << "... go to next pixel." << endl;241 // this should never occur, because bad pixels should have 242 // been set unused 243 *fLog << all << "MHSigmaTheta::Fill; bad pixel found which is used, id = " 244 << id << "... go to next pixel." << endl; 247 245 continue; 248 246 } … … 256 254 257 255 Double_t diff; 258 if (ratio > 0.5) 256 const Byte_t aidx = (*fCam)[id].GetAidx(); 257 if (aidx == 0) 259 258 { 260 259 // inner pixel -
trunk/MagicSoft/Mars/mhist/MHSigmaTheta.h
r4584 r4841 14 14 #endif 15 15 16 17 class MParList; 16 18 class MGeomCam; 17 19 class MCerPhotEvt; 18 20 class MPointingPos; 19 21 class MPedPhotCam; 20 class MSigmabar; 21 class MParList; 22 class MBlindPixels; 22 class MBadPixelsCam; 23 23 24 24 … … 29 29 MPedPhotCam *fPed; //! 30 30 MCerPhotEvt *fEvt; //! 31 MSigmabar *fSigmabar; //!32 31 MPointingPos *fPointPos; //! 33 MBlindPixels *fBlindPix; //! 32 MBadPixelsCam *fBad; //! 33 34 TString fNamePedPhotCam; //! name of the 'MPedPhotCam' container 34 35 35 36 // sigmabar is the average pedestal sigma … … 44 45 public: 45 46 MHSigmaTheta(const char *name=NULL, const char *title=NULL); 47 48 void SetNamePedPhotCam(const char *name) { fNamePedPhotCam = name; } 46 49 47 50 Bool_t SetupFill(const MParList *plist); -
trunk/MagicSoft/Mars/mhist/Makefile
r4463 r4841 22 22 -I../mgui -I../mgeom -I../mdata -I../mfilter -I../mimage \ 23 23 -I../mmain -I../mmc -I../mreflector -I../mpointing \ 24 -I../mastro -I../mpedestal 24 -I../mastro -I../mpedestal -I../mbadpixels 25 25 26 26 SRCFILES = MHEvent.cc \ … … 45 45 MHGamma.cc \ 46 46 MHFlux.cc \ 47 MHSigmaTheta.cc \ 47 48 MHSigmaPixel.cc \ 48 49 MHSigmabarTheta.cc \
Note:
See TracChangeset
for help on using the changeset viewer.