Changeset 5941
- Timestamp:
- 01/22/05 15:52:23 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r5940 r5941 28 28 much sense. 29 29 30 * mhcalib/MHCalibrationTestTimeCam.[h,cc] 31 * mhcalib/MHCalibrationTestCam.[h,cc] 32 - update to the latest changes in analysis chain. 33 34 * mjobs/MJExtractCalibTest.[h,cc] 35 - update to the latest changes in analysis chain. 36 30 37 * mjobs/MJCalibration.cc 31 38 - replace title of that times-averageing Tab from "RelTimes" by 32 39 "Times". 33 34 40 35 41 2005/01/21 Markus Gaug -
trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc
r5137 r5941 145 145 SetHistYTitle(gsHistYTitle.Data()); 146 146 147 SetLoGain(kFALSE); 148 147 149 } 148 150 … … 165 167 { 166 168 169 if (!InitCams(pList,"Test")) 170 return kFALSE; 171 172 167 173 MCerPhotEvt *signal = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt"); 168 174 if (!signal) … … 178 184 179 185 InitHiGainArrays(npixels,nareas,nsectors); 186 InitLoGainArrays(npixels,nareas,nsectors); 180 187 181 188 fMeanMeanPhotPerArea.Set(nareas); … … 184 191 fRmsSigmaPhotPerArea.Set(nareas); 185 192 186 SetLoGain(kFALSE);187 188 193 return kTRUE; 189 }190 191 192 //--------------------------------------------------------------------------------------193 //194 // Initializes the High Gain Arrays:195 //196 // - For every entry in the expanded arrays:197 // * Initialize an MHCalibrationPix198 // * Set Binning from fNbins, fFirst and fLast199 // * Set Histgram names and titles from fHistName and fHistTitle200 // * Set X-axis and Y-axis titles with fHistXTitle and fHistYTitle201 // * Call InitHists202 //203 void MHCalibrationTestCam::InitHiGainArrays(const Int_t npixels, const Int_t nareas, const Int_t nsectors)204 {205 206 if (fHiGainArray->GetSize()==0)207 {208 for (Int_t i=0; i<npixels; i++)209 {210 fHiGainArray->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainPix"),211 Form("%s%s",fHistTitle.Data()," High Gain Pixel")),i);212 213 MHCalibrationPix &pix = (*this)[i];214 pix.SetNbins(fNbins);215 pix.SetFirst(fFirst);216 pix.SetLast (fLast);217 218 MBadPixelsPix &bad = (*fBadPixels)[i];219 InitHists(pix,bad,i);220 }221 }222 223 if (!IsAverageing())224 return;225 226 if (fAverageHiGainAreas->GetSize()==0)227 {228 for (Int_t j=0; j<nareas; j++)229 {230 fAverageHiGainAreas->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainArea"),231 Form("%s%s",fHistTitle.Data()," High Gain Area Idx ")),j);232 233 MHCalibrationPix &pix = GetAverageHiGainArea(j);234 235 pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas));236 pix.SetFirst(fFirst);237 pix.SetLast (fLast);238 239 pix.InitBins();240 pix.SetEventFrequency(fPulserFrequency);241 }242 }243 244 if (fAverageHiGainSectors->GetSize()==0)245 {246 for (Int_t j=0; j<nsectors; j++)247 {248 fAverageHiGainSectors->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainSector"),249 Form("%s%s",fHistTitle.Data()," High Gain Sector ")),j);250 MHCalibrationPix &pix = GetAverageHiGainSector(j);251 252 pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors));253 pix.SetFirst(fFirst);254 pix.SetLast (fLast);255 256 pix.InitBins();257 pix.SetEventFrequency(fPulserFrequency);258 }259 }260 194 } 261 195 -
trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.h
r5479 r5941 36 36 Bool_t FinalizeHists(); 37 37 38 void InitHiGainArrays(const Int_t npix, const Int_t nareas, const Int_t nsectors);39 40 38 public: 41 39 -
trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc
r5137 r5941 110 110 const Int_t MHCalibrationTestTimeCam::fgNbins = 600; 111 111 const Axis_t MHCalibrationTestTimeCam::fgFirst = -0.5; 112 const Axis_t MHCalibrationTestTimeCam::fgLast = 29.5;112 const Axis_t MHCalibrationTestTimeCam::fgLast = 14.5; 113 113 const TString MHCalibrationTestTimeCam::gsHistName = "TestTime"; 114 114 const TString MHCalibrationTestTimeCam::gsHistTitle = "Calibrated Calibration Arrival Times"; … … 143 143 SetHistXTitle(gsHistXTitle.Data()); 144 144 SetHistYTitle(gsHistYTitle.Data()); 145 146 SetLoGain(kFALSE); 145 147 146 148 } … … 159 161 Bool_t MHCalibrationTestTimeCam::ReInitHists(MParList *pList) 160 162 { 163 164 if (!InitCams(pList,"")) 165 return kFALSE; 161 166 162 167 MArrivalTime *signal = (MArrivalTime*)pList->FindObject("MArrivalTime"); … … 172 177 173 178 InitHiGainArrays(npixels,nareas,nsectors); 174 175 SetLoGain(kFALSE); 179 InitLoGainArrays(npixels,nareas,nsectors); 176 180 177 181 return kTRUE; -
trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.h
r4742 r5941 48 48 49 49 Display_t fDisplayType; // Chosen Display type 50 51 TString fGeometry; 50 52 51 53 Bool_t ReadPedPhotCam(); … … 54 56 void DisplayResultT(MParList &plist); 55 57 56 Bool_t WriteResultD(); 57 Bool_t WriteResultT(); 58 Bool_t WriteResult(); 58 59 59 Bool_t ProcessFile D(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam);60 Bool_t ProcessFileT(MPedestalCam &pedcam, MCalibrationRelTimeCam &relcam); 60 Bool_t ProcessFile(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam, 61 MCalibrationRelTimeCam &rel, Byte_t filetype); 61 62 62 63 Bool_t CheckEnv(); … … 83 84 void SetNormalDisplay() { fDisplayType = kNormalDisplay; } 84 85 85 Bool_t Process D(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam);86 Bool_t ProcessT(MPedestalCam &pedcam, MCalibrationRelTimeCam &relcam); 86 Bool_t Process(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam, 87 MCalibrationRelTimeCam &relcam,Byte_t filetype=1); 87 88 88 89 ClassDef(MJExtractCalibTest, 0) // Tool to extract, calibrate and test the signal
Note:
See TracChangeset
for help on using the changeset viewer.