Changeset 2781
- Timestamp:
- 01/13/04 13:22:38 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r2780 r2781 54 54 * mreport/MReportCurrents.cc, mreport/MReportDAQ.cc: 55 55 - removed some obsolete comments (these comments confused THtml) 56 57 * manalysis/MCameraData.[h,cc], mfileio/MCT1ReadAscii.[h,cc], 58 mfileio/MCT1ReadPreProc.[h,cc], mfilter/MFCT1SelBasic.cc, 59 mfilter/MFSelBasic.cc, mhist/MHCamera.cc, mhist/MHEvent.[h,cc], 60 mimage/MImgCleanStd.[h,cc], mimage/MImgCleanTGB.[h,cc], 61 mmain/MAnalysis.cc, mmain/MEventDisplay.cc: 62 - replaced MPedestalCam by MPedPhotCam 63 - removed some obsolete includes 56 64 57 65 -
trunk/MagicSoft/Mars/manalysis/MCameraData.cc
r2488 r2781 38 38 #include "MLogManip.h" 39 39 40 #include "MPed estalCam.h"41 #include "MPed estalPix.h"40 #include "MPedPhotCam.h" 41 #include "MPedPhotPix.h" 42 42 43 43 #include "MSigmabar.h" … … 77 77 */ 78 78 79 void MCameraData::Calc (const MCerPhotEvt &evt, const MPedestalCam &cam,80 const MGeomCam &geom)79 void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, const MPedPhotCam &cam, 80 const MGeomCam &geom) 81 81 { 82 82 const Int_t n = geom.GetNumPixels(); … … 99 99 100 100 const Int_t idx = pix.GetPixId(); 101 const Float_t noise = cam[idx].Get PedestalRms();101 const Float_t noise = cam[idx].GetRms(); 102 102 103 103 if (noise<=0) // fData[idx]=0, fValidity[idx]=0 … … 113 113 } 114 114 115 void MCameraData::Calc (const MCerPhotEvt &evt, const MSigmabar &sgb,116 const MGeomCam &geom)115 void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, const MSigmabar &sgb, 116 const MGeomCam &geom) 117 117 { 118 Calc (evt, sgb.GetSigmabarInner(), geom);118 CalcCleaningLevel(evt, sgb.GetSigmabarInner(), geom); 119 119 } 120 120 121 void MCameraData::Calc (const MCerPhotEvt &evt, Double_t noise,122 const MGeomCam &geom)121 void MCameraData::CalcCleaningLevel(const MCerPhotEvt &evt, Double_t noise, 122 const MGeomCam &geom) 123 123 { 124 124 const Int_t n = geom.GetNumPixels(); -
trunk/MagicSoft/Mars/manalysis/MCameraData.h
r2488 r2781 15 15 class MSigmabar; 16 16 class MCerPhotEvt; 17 class MPed estalCam;17 class MPedPhotCam; 18 18 19 19 class MCameraData : public MCamEvent … … 29 29 UInt_t GetNumPixels() const { return fData.GetSize(); } 30 30 31 void Calc (const MCerPhotEvt &evt, const MPedestalCam &fCam,32 const MGeomCam &geom);33 void Calc (const MCerPhotEvt &evt, const MSigmabar &sgb,34 const MGeomCam &geom);35 void Calc (const MCerPhotEvt &evt, Double_t noise,36 const MGeomCam &geom);37 31 void CalcCleaningLevel(const MCerPhotEvt &evt, const MPedPhotCam &fCam, 32 const MGeomCam &geom); 33 void CalcCleaningLevel(const MCerPhotEvt &evt, const MSigmabar &sgb, 34 const MGeomCam &geom); 35 void CalcCleaningLevel(const MCerPhotEvt &evt, Double_t noise, 36 const MGeomCam &geom); 37 /* 38 38 void Calc(const MCerPhotEvt &evt, const MGeomCam &geom) 39 39 { 40 Calc (evt, 1, geom);40 CalcCleaningLevel(evt, 1, geom); 41 41 } 42 42 */ 43 43 const TArrayD &GetData() const { return fData; } 44 44 const TArrayC &GetValidity() const { return fValidity; } -
trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc
r2239 r2781 52 52 #include "MCerPhotEvt.h" 53 53 54 #include "MPed estalPix.h"55 #include "MPed estalCam.h"54 #include "MPedPhotPix.h" 55 #include "MPedPhotCam.h" 56 56 57 57 ClassImp(MCT1ReadAscii); … … 154 154 // them if they don't exist. 155 155 // 156 // Initialize the size of the MPed estalCam container to 127 pixels (CT1 camera)156 // Initialize the size of the MPedPhotCam container to 127 pixels (CT1 camera) 157 157 // 158 158 Int_t MCT1ReadAscii::PreProcess(MParList *pList) … … 178 178 // look for the pedestal class in the plist 179 179 // 180 fPedest = (MPed estalCam*)pList->FindCreateObj("MPedestalCam");180 fPedest = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam"); 181 181 if (!fPedest) 182 182 return kFALSE; … … 210 210 *fIn >> val; 211 211 212 if (val > 0.0)213 (*fPedest)[i].Set PedestalRms(val);212 if (val>0) 213 (*fPedest)[i].Set(0, val); 214 214 } 215 215 } … … 221 221 void MCT1ReadAscii::ReadData() 222 222 { 223 /*224 //225 // clear the list of cerphot-events226 //227 fNphot->Clear();228 */229 230 223 // 231 224 // five unsused numbers … … 242 235 // too the list with it's id, number of photons and error 243 236 // 244 // fNphot->InitSize(127);245 246 237 for (Int_t i = 0; i<127; i++ ) 247 238 { … … 251 242 252 243 if (nphot > 0.0) 253 fNphot->AddPixel(i, nphot, (*fPedest)[i].Get PedestalRms());244 fNphot->AddPixel(i, nphot, (*fPedest)[i].GetRms()); 254 245 } 255 246 fNphot->FixSize(); … … 270 261 // reading event data by the 'switch entry'. 271 262 // After reading it should set the InputStreamID correctly. 272 // ( should use MPedestalCam )263 // (should use MPedPhotCam ) 273 264 // 274 265 -
trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.h
r2206 r2781 8 8 class TList; 9 9 class MCerPhotEvt; 10 class MPed estalCam;10 class MPedPhotCam; 11 11 12 12 class MCT1ReadAscii : public MTask 13 13 { 14 14 private: 15 ifstream *fIn;// the inputfile16 MCerPhotEvt *fNphot;// the data container for all data.17 MPed estalCam *fPedest; // ct1 pedestals18 TList *fFileNames;// Array which stores the \0-terminated filenames15 ifstream *fIn; // the inputfile 16 MCerPhotEvt *fNphot; // the data container for all data. 17 MPedPhotCam *fPedest; // CT1 pedestals 18 TList *fFileNames; // Array which stores the \0-terminated filenames 19 19 20 20 Bool_t OpenNextFile(); -
trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc
r2653 r2781 38 38 // Output Containers: 39 39 // MCerPhotEvt the data container for all data. 40 // MPed estalCam ct1 pedestals40 // MPedPhotCam CT1 pedestals 41 41 // MMcEvt monte carlo data container for MC files 42 42 // MMcTrig mc data container for trigger information … … 67 67 #include "MCerPhotEvt.h" 68 68 69 #include "MPed estalPix.h"70 #include "MPed estalCam.h"69 #include "MPedPhotPix.h" 70 #include "MPedPhotCam.h" 71 71 72 72 #include "MGeomCam.h" … … 355 355 for (Int_t i=0; i<iMAXNUMPIX; i++) 356 356 { 357 (*fPedest)[i].Set PedestalRms(outpars.frms_pedsig_phot[i]);357 (*fPedest)[i].Set(0, outpars.frms_pedsig_phot[i]); 358 358 *fLog << outpars.frms_pedsig_phot[i] << " "; 359 359 fPedRMS[i] = outpars.frms_pedsig_phot[i]; … … 722 722 // them if they don't exist. 723 723 // 724 // Initialize the size of the MPed estalCam container to 127 pixels (CT1 camera)724 // Initialize the size of the MPedPhotCam container to 127 pixels (CT1 camera) 725 725 // 726 726 Int_t MCT1ReadPreProc::PreProcess(MParList *pList) … … 754 754 // look for the pedestal class in the plist 755 755 // 756 fPedest = (MPed estalCam*)pList->FindCreateObj("MPedestalCam");756 fPedest = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam"); 757 757 if (!fPedest) 758 758 return kFALSE; … … 901 901 // reset pedestal RMS for this event 902 902 for (Int_t i=0; i<iMAXNUMPIX; i++) 903 (*fPedest)[i].Set PedestalRms(fPedRMS[i]);903 (*fPedest)[i].Set(0, fPedRMS[i]); 904 904 905 905 // int isecs_since_midday; // seconds passed since midday before sunset (JD of run start) … … 944 944 continue; 945 945 946 fNphot->AddPixel(i, 0.1*event.spixsig_10thphot[i], 947 (*fPedest)[i].GetPedestalRms()); 946 fNphot->AddPixel(i, 0.1*event.spixsig_10thphot[i], (*fPedest)[i].GetRms()); 948 947 } 949 948 fNphot->FixSize(); -
trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h
r2296 r2781 21 21 class MSrcPosCam; 22 22 class MCerPhotEvt; 23 class MPed estalCam;23 class MPedPhotCam; 24 24 class MBlindPixels; 25 25 class MRawRunHeader; … … 40 40 MGeomCam *fGeom; // camera geometry 41 41 MCerPhotEvt *fNphot; // the data container for all data. 42 MPed estalCam*fPedest; // ct1 pedestals42 MPedPhotCam *fPedest; // ct1 pedestals 43 43 MTime *fTime; // event time 44 44 MMcEvt *fMcEvt; // monte carlo data container for MC files -
trunk/MagicSoft/Mars/mfilter/MFCT1SelBasic.cc
r2282 r2781 54 54 #include "MGeomCam.h" 55 55 56 #include "MPedestalPix.h"57 #include "MPedestalCam.h"58 59 56 #include "MLog.h" 60 57 #include "MLogManip.h" … … 127 124 return kFALSE; 128 125 } 129 /* 130 fPed = (MPedestalCam*)pList->FindObject("MPedestalCam"); 131 if (!fPed) 132 { 133 *fLog << dbginf << "MPedestalCam missing in Parameter List... aborting." << endl; 134 return kFALSE; 135 } 136 */ 126 137 127 memset(fCut, 0, sizeof(fCut)); 138 128 -
trunk/MagicSoft/Mars/mfilter/MFSelBasic.cc
r2663 r2781 54 54 #include "MGeomCam.h" 55 55 56 #include "MPedestalPix.h"57 #include "MPedestalCam.h"58 59 56 #include "MLog.h" 60 57 #include "MLogManip.h" … … 127 124 return kFALSE; 128 125 } 129 /* 130 fPed = (MPedestalCam*)pList->FindObject("MPedestalCam"); 131 if (!fPed) 132 { 133 *fLog << dbginf << "MPedestalCam missing in Parameter List... aborting." << endl; 134 return kFALSE; 135 } 136 */ 126 137 127 memset(fCut, 0, sizeof(fCut)); 138 128 -
trunk/MagicSoft/Mars/mhist/MHCamera.cc
r2762 r2781 62 62 #include "MGeomCam.h" 63 63 64 #include "MCerPhotPix.h"65 #include "MCerPhotEvt.h"66 67 #include "MPedestalPix.h"68 #include "MPedestalCam.h"69 70 #include "MCurrents.h"71 64 #include "MCamEvent.h" 72 73 #include "MImgCleanStd.h"74 65 75 66 -
trunk/MagicSoft/Mars/mhist/MHEvent.cc
r2754 r2781 57 57 #include "MParList.h" 58 58 #include "MTaskList.h" 59 #include "MPedestalCam.h"60 #include "MPedestalPix.h"61 59 #include "MParList.h" 62 60 #include "MCerPhotEvt.h" -
trunk/MagicSoft/Mars/mhist/MHEvent.h
r2754 r2781 13 13 class MMcEvt; 14 14 class MCerPhotEvt; 15 class MPedestalCam;16 15 class MImgCleanStd; 17 16 class MCameraSignal; … … 33 32 MMcEvt *fMcEvt; //! 34 33 MCerPhotEvt *fCerPhotEvt; //! 35 MPedestalCam *fPedestalCam; //!36 34 MImgCleanStd *fImgCleanStd; //! 37 35 MCameraSignal *fCamSignal; //! -
trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc
r2670 r2781 274 274 #include "MCerPhotEvt.h" 275 275 276 #include "MPedestalPix.h"277 #include "MPedestalCam.h"278 279 276 #include "MGGroupFrame.h" // MGGroupFrame 280 277 … … 559 556 else 560 557 { 561 fPed = (MPed estalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));558 fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam")); 562 559 if (!fPed) 563 560 { 564 *fLog << dbginf << "MPed estalCam not found... aborting." << endl;561 *fLog << dbginf << "MPedPhotCam not found... aborting." << endl; 565 562 return kFALSE; 566 563 } … … 581 578 { 582 579 if (fSgb) 583 fData->Calc (*fEvt, *fSgb, *fCam);580 fData->CalcCleaningLevel(*fEvt, *fSgb, *fCam); 584 581 else 585 fData->Calc (*fEvt, *fPed, *fCam);582 fData->CalcCleaningLevel(*fEvt, *fPed, *fCam); 586 583 587 584 #ifdef DEBUG -
trunk/MagicSoft/Mars/mimage/MImgCleanStd.h
r2488 r2781 10 10 class MCerPhotPix; 11 11 class MCerPhotEvt; 12 class MPed estalCam;12 class MPedPhotCam; 13 13 class MCameraData; 14 14 … … 24 24 25 25 private: 26 const MGeomCam 27 MCerPhotEvt 28 MSigmabar 29 MPed estalCam *fPed; //!30 MCameraData 26 const MGeomCam *fCam; //! 27 MCerPhotEvt *fEvt; //! 28 MSigmabar *fSgb; //! 29 MPedPhotCam *fPed; //! 30 MCameraData *fData; //! 31 31 32 32 CleaningMethod_t fCleaningMethod; -
trunk/MagicSoft/Mars/mimage/MImgCleanTGB.cc
r2465 r2781 59 59 #include "MCerPhotEvt.h" 60 60 61 #include "MPed estalPix.h"62 #include "MPed estalCam.h"61 #include "MPedPhotPix.h" 62 #include "MPedPhotCam.h" 63 63 64 64 #include "MGGroupFrame.h" // MGGroupFrame … … 223 223 else 224 224 { 225 fPed = (MPed estalCam*)pList->FindObject("MPedestalCam");225 fPed = (MPedPhotCam*)pList->FindObject("MPedPhotCam"); 226 226 if (!fPed) 227 227 { 228 *fLog << dbginf << "MPed estalCam not found... aborting." << endl;228 *fLog << dbginf << "MPedPhotCam not found... aborting." << endl; 229 229 return kFALSE; 230 230 } … … 257 257 const Double_t factor = fCam->GetPixRatio(idx); 258 258 const Double_t factorsqrt = fCam->GetPixRatioSqrt(idx); 259 const Float_t noise = (*fPed)[idx].Get PedestalRms();259 const Float_t noise = (*fPed)[idx].GetRms(); 260 260 261 261 if (entry * factorsqrt <= fCleanLvl2 * noise) -
trunk/MagicSoft/Mars/mimage/MImgCleanTGB.h
r2296 r2781 10 10 class MCerPhotPix; 11 11 class MCerPhotEvt; 12 class MPed estalCam;12 class MPedPhotCam; 13 13 14 14 class MGGroupFrame; … … 23 23 24 24 private: 25 const MGeomCam 26 MCerPhotEvt 27 MSigmabar 28 MPed estalCam *fPed; //!25 const MGeomCam *fCam; //! 26 MCerPhotEvt *fEvt; //! 27 MSigmabar *fSgb; //! 28 MPedPhotCam *fPed; //! 29 29 30 30 CleaningMethod_t fCleaningMethod; -
trunk/MagicSoft/Mars/mmain/MAnalysis.cc
r2498 r2781 125 125 #include "MTaskList.h" 126 126 #include "MGeomCamMagic.h" 127 #include "MPedestalCam.h"128 127 #include "MHHillas.h" 129 128 #include "MHStarMap.h" -
trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
r2754 r2781 188 188 MCerPhotCalc *ncalc = new MCerPhotCalc; 189 189 MCerPhotAnal2 *nanal = new MCerPhotAnal2; 190 MFillH *fill1 = new MFillH(evt1, "MCerPhotEvt", 190 MFillH *fill1 = new MFillH(evt1, "MCerPhotEvt", "MFillH1"); 191 191 MImgCleanStd *clean = new MImgCleanStd; 192 MFillH *fill2 = new MFillH(evt2, "MCerPhotEvt", 193 MFillH *fill3 = new MFillH(evt3, "MPed estalCam", "MFillH3");194 MFillH *fill4 = new MFillH(evt4, "MPed estalCam", "MFillH4");195 MFillH *fill5 = new MFillH(evt5, "MCameraData", 196 MFillH *fill6 = new MFillH(evt6, "MCameraData", 192 MFillH *fill2 = new MFillH(evt2, "MCerPhotEvt", "MFillH2"); 193 MFillH *fill3 = new MFillH(evt3, "MPedPhotCam", "MFillH3"); 194 MFillH *fill4 = new MFillH(evt4, "MPedPhotCam", "MFillH4"); 195 MFillH *fill5 = new MFillH(evt5, "MCameraData", "MFillH5"); 196 MFillH *fill6 = new MFillH(evt6, "MCameraData", "MFillH6"); 197 197 MBlindPixelCalc *blind = new MBlindPixelCalc; 198 198 MHillasCalc *hcalc = new MHillasCalc;
Note:
See TracChangeset
for help on using the changeset viewer.