Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 5377) +++ /trunk/MagicSoft/Mars/Changelog (revision 5378) @@ -20,4 +20,37 @@ -*-*- END OF LINE -*-*- + 2004/11/11: Thomas Bretz + + * callisto.cc: + - fixed a typo in the screen output + + * mastro/MAstroCamera.cc: + - made a simple simplification + + * mmuon/MMuonSearchParCalc.cc: + - changed some log-output to be standard + + * mpedestal/MPedCalcFromLoGain.[h,cc]: + - Updated fTitle + - Fixed AddToBranchList entries + - invented a new function (ResetArrays) + - added a return value to SetCheckRange + - added a return value to SetCheckRange + - changed arguments of SetExtractWindow to UShort_t which is more + intuitive + - changed arguments of SetExtractWindow to UShort_t which is more + intuitive + - changed some log-output to be more standard + - changed return type of GetSlice to UShort_t + - fixed names of resources to fit variable names + - implemented Print() + - changed types of default to UShort_t + + * mraw/MRawRead.cc: + - fixed a bug which caused the special pixel indices to be 2,3,4,... + instead of 0,1,2,3,... + + + 2004/11/10: Abelardo Moralejo @@ -80,4 +113,5 @@ weights are quasi randomly chosen and applied to the first slices available in the set range + * msignal/MC_weights.dat - new weights file using 6 slices for the digital filter, especially Index: /trunk/MagicSoft/Mars/callisto.cc =================================================================== --- /trunk/MagicSoft/Mars/callisto.cc (revision 5377) +++ /trunk/MagicSoft/Mars/callisto.cc (revision 5378) @@ -70,5 +70,5 @@ gLog << " --print-files Print Files taken from Sequence" << endl; gLog << " --print-only Do not excute anything except print" << endl; - gLog << " --config=callisto.rc Resource file [default=callistop.rc]" << endl; + gLog << " --config=callisto.rc Resource file [default=callisto.rc]" << endl; gLog << endl; gLog << " -?, -h, --help This help" << endl << endl; Index: /trunk/MagicSoft/Mars/mastro/MAstroCamera.cc =================================================================== --- /trunk/MagicSoft/Mars/mastro/MAstroCamera.cc (revision 5377) +++ /trunk/MagicSoft/Mars/mastro/MAstroCamera.cc (revision 5378) @@ -394,8 +394,5 @@ { TMarker *m=new TMarker(spot(0), spot(1), 1); - TVector3 pos=mirror->GetMirrorCenter(); - Float_t r=pos.Mag(); - - m->SetMarkerColor((Int_t)(6*r)+51); + m->SetMarkerColor((Int_t)(6*mirror->GetMirrorCenter().Mag())+51); m->SetMarkerStyle(kDot); fMapG.Add(m); Index: /trunk/MagicSoft/Mars/mmuon/MMuonSearchParCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mmuon/MMuonSearchParCalc.cc (revision 5377) +++ /trunk/MagicSoft/Mars/mmuon/MMuonSearchParCalc.cc (revision 5378) @@ -89,5 +89,5 @@ if (!fHillas) { - *fLog << err << dbginf << "MHillas not found... aborting." << endl; + *fLog << err << fHillasInput << " [MHillas] not found... aborting." << endl; return kFALSE; } @@ -96,5 +96,5 @@ if (!fCerPhotEvt) { - *fLog << dbginf << "MCerPhotEvt not found... aborting." << endl; + *fLog << err << fCerPhotName << " [MCerPhotEvt] not found... aborting." << endl; return kFALSE; } @@ -103,5 +103,5 @@ if (!fGeomCam) { - *fLog << dbginf << "MGeomCam (Camera Geometry) missing in Parameter List... aborting." << endl; + *fLog << err << "MGeomCam not found... aborting." << endl; return kFALSE; } Index: /trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc =================================================================== --- /trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc (revision 5377) +++ /trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc (revision 5378) @@ -31,8 +31,5 @@ ///////////////////////////////////////////////////////////////////////////// // -// -// // MPedCalcLoGain -// // // This task is devide form MPedCalcPedRun, described below. However, It @@ -157,9 +154,9 @@ using namespace std; -const Int_t MPedCalcFromLoGain::fgCheckWinFirst = 0; -const Int_t MPedCalcFromLoGain::fgCheckWinLast = 29; -const Int_t MPedCalcFromLoGain::fgExtractWinFirst = 15; -const Int_t MPedCalcFromLoGain::fgExtractWinSize = 6; -const Int_t MPedCalcFromLoGain::fgMaxSignalVar = 40; +const UShort_t MPedCalcFromLoGain::fgCheckWinFirst = 0; +const UShort_t MPedCalcFromLoGain::fgCheckWinLast = 29; +const UShort_t MPedCalcFromLoGain::fgExtractWinFirst = 15; +const UShort_t MPedCalcFromLoGain::fgExtractWinSize = 6; +const UShort_t MPedCalcFromLoGain::fgMaxSignalVar = 40; // -------------------------------------------------------------------------- @@ -177,20 +174,32 @@ // MPedCalcFromLoGain::MPedCalcFromLoGain(const char *name, const char *title) - : fGeom(NULL), fPedContainerName("MPedestalCam") -{ - - fName = name ? name : "MPedCalcFromLoGain"; - fTitle = title ? title : "Task to calculate pedestals from pedestal runs raw data"; - - AddToBranchList("fHiGainPixId"); - AddToBranchList("fHiGainFadcSamples"); - - SetCheckRange(fgCheckWinFirst, fgCheckWinLast); - SetExtractWindow(fgExtractWinFirst, fgExtractWinSize); - - SetMaxSignalVar(fgMaxSignalVar); - SetPedestalUpdate(kTRUE); - Clear(); - + : fGeom(NULL), fNamePedestalCam("MPedestalCam") +{ + fName = name ? name : "MPedCalcFromLoGain"; + fTitle = title ? title : "Task to calculate pedestals from lo-gains"; + + AddToBranchList("fHiGainPixId"); + AddToBranchList("fLoGainPixId"); + AddToBranchList("fHiGainFadcSamples"); + AddToBranchList("fLoGainFadcSamples"); + + SetCheckRange(fgCheckWinFirst, fgCheckWinLast); + SetExtractWindow(fgExtractWinFirst, fgExtractWinSize); + + SetMaxSignalVar(fgMaxSignalVar); + SetPedestalUpdate(kTRUE); + + Clear(); +} + +void MPedCalcFromLoGain::ResetArrays() +{ + // Reset contents of arrays. + fSumx.Reset(); + fSumx2.Reset(); + fSumAB0.Reset(); + fSumAB1.Reset(); + fNumEventsUsed.Reset(); + fTotalCounter.Reset(); } @@ -219,13 +228,5 @@ // If the size is yet set, set the size if (fSumx.GetSize()>0) - { - // Reset contents of arrays. - fSumx.Reset(); - fSumx2.Reset(); - fSumAB0.Reset(); - fSumAB1.Reset(); - fNumEventsUsed.Reset(); - fTotalCounter.Reset(); - } + ResetArrays(); } @@ -237,53 +238,48 @@ // Exits, if the the last argument is smaller than the first // -void MPedCalcFromLoGain::SetCheckRange(Int_t chfirst, Int_t chlast) -{ - - if(chfirst<0) - { - *fLog << warn << GetDescriptor() - << ": First slice in window to check for Signal <0, adjust:" << endl; - exit(-1); - } - - if(chlast<=chfirst) - { - *fLog << warn << GetDescriptor() - << ": Last slice in Check window smaller than first slice in window, adjust:" << endl; - exit(-1); - } - - fCheckWinFirst = chfirst; - fCheckWinLast = chlast; - -} - -// -------------------------------------------------------------------------- -// -// Exits: +Bool_t MPedCalcFromLoGain::SetCheckRange(UShort_t chfirst, UShort_t chlast) +{ + Bool_t rc = kTRUE; + + if (chlast<=chfirst) + { + *fLog << warn << GetDescriptor(); + *fLog << " - WARNING: Last slice in SetCheckRange smaller than first slice... set to first+2" << endl; + chlast = chfirst+1; + rc = kFALSE; + } + + fCheckWinFirst = chfirst; + fCheckWinLast = chlast; + + return rc; +} + +// -------------------------------------------------------------------------- +// +// Checks: // - if a window is odd -// -void MPedCalcFromLoGain::SetExtractWindow(Int_t windowf, Int_t windows) -{ - - if(windowf<0) - { - *fLog << warn << GetDescriptor() - << Form(": First slice in Extract window has to be >0, adjust:")<< endl; - exit(-1); - } - - Int_t odd = windows & 0x1; - - if (odd||(windows==0)) - { - *fLog << warn << GetDescriptor() << ": Extract window size has to be even and larger 0, adjust!"<< endl; - exit(-1); - } - - fExtractWinSize = windows; - fExtractWinFirst = windowf; - fExtractWinLast = fExtractWinFirst+fExtractWinSize-1; - +// +Bool_t MPedCalcFromLoGain::SetExtractWindow(UShort_t windowf, UShort_t windows) +{ + Bool_t rc = kTRUE; + + const Int_t odd = windows & 0x1; + + if (odd || windows==0) + { + *fLog << warn << GetDescriptor(); + *fLog << " - WARNING: Window size in SetExtraxtWindow has to be even and > 0... adjusting!" << endl; + windows += 1; + rc = kFALSE; + } + + fExtractWinSize = windows; + fExtractWinFirst = windowf; + fExtractWinLast = fExtractWinFirst+fExtractWinSize-1; + +// +// NO RANGE CHECK IMPLEMENTED, YET +// /* const Byte_t availhirange = (fHiGainLast-fHiGainFirst+1) & ~1; @@ -309,5 +305,7 @@ fWindowSizeLoGain = availlorange; } -*/ + */ + + return rc; } @@ -330,8 +328,8 @@ Clear(); - fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData"); + fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData")); if (!fRawEvt) { - *fLog << err << "MRawEvtData not found... aborting." << endl; + *fLog << err << AddSerialNumber("MRawEvtData") << " not found... aborting." << endl; return kFALSE; } @@ -344,22 +342,18 @@ } - fGeom = (MGeomCam*)pList->FindObject("MGeomCam"); + fGeom = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam")); if (!fGeom) { - *fLog << err << "MGeomCam not found... aborting." << endl; + *fLog << err << AddSerialNumber("MGeomCam") << " not found... aborting." << endl; return kFALSE; } - - fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", AddSerialNumber(fPedContainerName)); + fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", AddSerialNumber(fNamePedestalCam)); if (!fPedestals) return kFALSE; - - *fLog << inf << "Parameters used for pedestal calculation:"<GetNumSamplesHiGain() - +(Int_t)fRunHeader->GetNumSamplesLoGain()-1; - Int_t lastextractslice = fExtractWinSize+ fExtractWinFirst - 1; - - if ( lastextractslice > lastavailableslice ) //changed to override check - { - *fLog << endl; - *fLog << warn << GetDescriptor() - << Form(": Selected Extract Window ranges out of the available limits adjust. Last available slice is %2i", - lastavailableslice) << endl; - return kFALSE; - } - - if ( fCheckWinLast > lastavailableslice ) //changed to override check - { - *fLog << endl; - *fLog << warn << GetDescriptor() - << Form(": Last Check Window slice is out of the available limits adjust. Last available slice is %2i", - lastavailableslice) << endl; - return kFALSE; - } - - - + Int_t lastavailableslice = fRunHeader->GetNumSamplesHiGain()+fRunHeader->GetNumSamplesLoGain()-1; + Int_t lastextractslice = fExtractWinSize + fExtractWinFirst - 1; + + if (lastextractslice>lastavailableslice)//changed to override check + { + *fLog << warn << GetDescriptor(); + *fLog << " - WARNING: Selected Extract Window ranges out of range...adjusting to last available slice "; + *fLog << lastavailableslice << endl; + + lastextractslice=lastavailableslice; + } + + if (fCheckWinLast>lastavailableslice)//changed to override check + { + *fLog << warn << GetDescriptor(); + *fLog << " - WARNING: Last Check Window slice out of range...adjusting to last available slice "; + *fLog << lastavailableslice << endl; + + fCheckWinLast=lastavailableslice; + } + + // If the size is not yet set, set the size if (fSumx.GetSize()==0) @@ -421,11 +412,5 @@ fTotalCounter.Set(npixels); - // Reset contents of arrays. - fSumx.Reset(); - fSumx2.Reset(); - fSumAB0.Reset(); - fSumAB1.Reset(); - fNumEventsUsed.Reset(); - fTotalCounter.Reset(); + ResetArrays(); } @@ -473,21 +458,14 @@ // Returns the pointer to slice "slice". // -UInt_t MPedCalcFromLoGain::GetSlice(MRawEvtPixelIter *pixel, UInt_t slice) -{ - - const UInt_t nh = (Int_t)fRunHeader->GetNumSamplesHiGain(); - - Byte_t *ptr; - - if(slice>=nh) - { - ptr = pixel->GetLoGainSamples(); - ptr += slice - nh; - } - else - { - ptr = pixel->GetHiGainSamples(); - ptr += slice; - } +UShort_t MPedCalcFromLoGain::GetSlice(MRawEvtPixelIter *pixel, UInt_t slice) +{ + const UShort_t nh = (Int_t)fRunHeader->GetNumSamplesHiGain(); + + Byte_t *ptr; + + if(sliceGetHiGainSamples() + slice; + else + ptr = pixel->GetLoGainSamples() + slice - nh; return *ptr; @@ -506,22 +484,17 @@ while (pixel.Next()) { - - const UInt_t idx = pixel.GetPixelId(); - - Int_t max = 0; - Int_t min = 1025; - + const UInt_t idx = pixel.GetPixelId(); + + UShort_t max = 0; + UShort_t min = (UShort_t)-1; + // Find the maximum and minimum signal per slice in the high gain window - - for(Int_t slice=fCheckWinFirst; slice<=fCheckWinLast; slice++) - { - - Int_t svalue = GetSlice(&pixel,slice); - if (svalue > max) { + for (Int_t slice=fCheckWinFirst; slice<=fCheckWinLast; slice++) + { + const UShort_t svalue = GetSlice(&pixel,slice); + if (svalue > max) max = svalue; - } - if (svalue < min) { + if (svalue < min) min = svalue; - } } @@ -535,32 +508,27 @@ //extract pedestal for(Int_t slice=fExtractWinFirst; slice<=fExtractWinLast; slice++) - { - UInt_t svalue = GetSlice(&pixel,slice); - sum += svalue; - sqr += svalue*svalue; + { + const UInt_t svalue = GetSlice(&pixel,slice); + sum += svalue; + sqr += svalue*svalue; } - const Float_t msum = (Float_t)sum; - const Float_t sqrsum = msum*msum; - - fSumx[idx] += msum; - fSumx2[idx] += sqrsum; + fSumx[idx] += sum; + fSumx2[idx] += sum*sum; + fNumEventsUsed[idx]++; // Calculate the amplitude of the 150MHz "AB" noise - - Int_t abFlag = (fExtractWinFirst + pixel.HasABFlag()) & 0x1; - - //cout << " MPedCalcFromLoGain: idx: " << idx << " abFlag: " << abFlag << endl; - - for (Int_t islice=fExtractWinFirst; islice<=fExtractWinLast; islice+=2) + UShort_t abFlag = (fExtractWinFirst + pixel.HasABFlag()) & 0x1; + + for (UShort_t islice=fExtractWinFirst; islice<=fExtractWinLast; islice+=2) { - Int_t sliceAB0 = islice + abFlag; - Int_t sliceAB1 = islice - abFlag + 1; + const UShort_t sliceAB0 = islice + abFlag; + const UShort_t sliceAB1 = islice - abFlag + 1; fSumAB0[idx] += GetSlice(&pixel, sliceAB0); fSumAB1[idx] += GetSlice(&pixel, sliceAB1); } - if (!fPedestalUpdate || fNumEventsUsed[idx]ReadPixel(fin, hwid-1, TESTBIT(ab, j)); else - fRawEvtData2->ReadPixel(fin, -(hwid-1), TESTBIT(ab, j)); + fRawEvtData2->ReadPixel(fin, -(hwid+1), TESTBIT(ab, j)); }