Changeset 2487 for trunk/MagicSoft/Mars

Timestamp:

11/07/03 18:50:44 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (2 diffs)
• manalysis/MMcPedestalCopy.cc (modified) (1 diff)
• manalysis/MMcPedestalCopy.h (modified) (1 diff)
• mraw/MRawEvtData.cc (modified) (2 diffs)
• mraw/MRawEvtPixelIter.cc (modified) (3 diffs)
• mraw/MRawEvtPixelIter.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -38 +38 @@
    * status.cc:
      - added (not yet in Makefile)
+
+   * manalysis/MMcPedestalCopy.[h,cc]:
+     - made sure, that MPedestalCam is in the list 
+     
+   * mraw/MRawEvtData.cc:
+     - set the maximum/minimum of the fadc histograms
+     
+   * mraw/MRawEvtPixelIter.[h,cc]:
+     - added a fixes for the case that fData->fLoGainPixId->GetArray()=NULL
 
 

trunk/MagicSoft/Mars/Makefile

@@ -74 +74 @@
         @echo " "
 
+include Makefile.rules
 include Makefile.depend
 
@@ -127 +128 @@
         root -b -q dohtml.C
 
-include Makefile.rules
-
 clean:  rmcint rmobjs rmcore rmlib
 

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -91 +91 @@
 // --------------------------------------------------------------------------
 //
+// Make sure, that there is an MPedestalCam Object in the Parameter List.
+//
+Int_t MMcPedestalCopy::PreProcess(MParList *pList)
+{
+    // FIXME: This should be done for MC files only...
+    return pList->FindCreateObj(AddSerialNumber("MPedestalCam")) ? kTRUE : kFALSE;
+}
+
+// --------------------------------------------------------------------------
+//
 // Check for the runtype.
 // Search for MPedestalCam and MMcFadcHeader.

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.h

@@ -10 +10 @@
 private:
     Bool_t CheckRunType(MParList *pList) const;
+    Int_t  PreProcess(MParList *pList);
     Bool_t ReInit(MParList *pList);
 

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -269 +269 @@
 
         TH1F *histhi = graphhi->GetHistogram();
-
+        histhi->SetMinimum(0);
+        histhi->SetMaximum(255);
+ 
         histhi->SetXTitle("Time/FADC Slices");
         histhi->SetYTitle("Signal/FADC Units");
@@ -302 +304 @@
 
         TH1F *histh = new TH1F(name, "FADC Samples", nh, -0.5, nh-.5);
+        histh->SetMinimum(0);
+        histh->SetMaximum(255);
         histh->SetXTitle("Time [FADC Slices]");
         histh->SetYTitle("Signal [FADC Units]");

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -57 +57 @@
 ClassImp(MRawEvtPixelIter);
 
+using namespace std;
+
 MRawEvtPixelIter::MRawEvtPixelIter(MRawEvtData *dat) : fData(dat)
 {
@@ -92 +94 @@
     //
     if (fNumLoGainEntry != fData->fLoGainPixId->GetSize())
-        if (*fHiGainId == *fLoGainId)
+        if (HasLoGain())
         {
             //
@@ -133 +135 @@
     //
     fHiGainId   = fData->fHiGainPixId->GetArray()-1;
-    fLoGainId   = fData->fLoGainPixId->GetArray()-1;
+    fLoGainId   = fData->fLoGainPixId->GetArray();
     fHiGainPos  = fData->fHiGainFadcSamples->GetArray()-fNumHiGainSamples;
     fLoGainPos  = fData->fLoGainFadcSamples->GetArray()-fNumLoGainSamples;
+
+    //
+    // In case fLoGainPixId.GetSize()=0 some root versions seems to
+    // initialize the array with NULL. This makes both cases work.
+    //
+    if (fLoGainId)
+        fLoGainId -= 1;
 }
 

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

@@ -91 +91 @@
         // return kTRUE  the lo gains exist for the actual pixel, else return kFALSE
         //
-        return *fHiGainId==*fLoGainId;
+        return fLoGainId && *fHiGainId==*fLoGainId;
     }