Changeset 2331 for trunk

Timestamp:

09/12/03 15:43:56 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHFadcCam.cc (modified) (2 diffs)
• mhist/MHFadcPix.cc (modified) (1 diff)
• mmain/MDataCheck.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -6 +6 @@
      - fixed the NaN-problem in the calculation of Alpha. More 
        information can be found in the comments there.
+
+   * mhist/MHFadcCam.cc:
+     - skip MC events which have no FADC information stored
+     - better output in case of changes in the number of slices
+     
+   * mhist/MHFadcPix.cc:
+     - fixed the missing y-axis (UseCurrentStyle()) 
+
+   * mmain/MDataCheck.cc
+     - added 'Time Spectra of Cosmics' button
+     
 
 

trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

@@ -102 +102 @@
     if (fType==MHFadcPix::kSlices)
     {
+        const Int_t nhi = par->GetNumHiGainSamples();
+
+        //
+        // skip MC events without FADC information stored
+        //
+        if (nhi==0)
+            return kTRUE;
+
         const Int_t nlo = par->GetNumLoGainSamples();
-        const Int_t nhi = par->GetNumHiGainSamples();
 
         //
@@ -112 +119 @@
                 (*this)[i].Init(nhi, nlo);
         else
-            if (fNumHiGains!=nhi || fNumLoGains!=nlo)
+        {
+            if (fNumLoGains!=nlo)
             {
-                *fLog << err << dbginf << "ERROR - Number of lo- or hi-gain samples changed." << endl;
+                *fLog << err << dbginf << "ERROR - Number of lo-gain samples changed from " << fNumLoGains << " to " << nlo << endl;
                 return kFALSE;
             }
+            if (fNumHiGains!=nhi)
+            {
+                *fLog << err << dbginf << "ERROR - Number of hi-gain samples changed from " << fNumHiGains << " to " << nhi << endl;
+                return kFALSE;
+            }
+        }
 
         fNumHiGains = nhi;

trunk/MagicSoft/Mars/mhist/MHFadcPix.cc

@@ -54 +54 @@
     fHistHi.SetTitle(pixid ? Form("Hi Gain Pixel #%d", pixid) : "Hi Gain Samples");
     fHistHi.SetDirectory(NULL);
+    fHistHi.UseCurrentStyle();
 
     fHistLo.SetName(pixid ? Form("LoGain%03d", pixid) : "LoGain");
     fHistLo.SetTitle(pixid ? Form("Lo Gain Pixel #%d", pixid) : "Lo Gain Samples");
     fHistLo.SetDirectory(NULL);
+    fHistLo.UseCurrentStyle();
 
     if (fType==kValue)

trunk/MagicSoft/Mars/mmain/MDataCheck.cc

@@ -59 +59 @@
 {
     //TGTextButton *pedadc = new TGTextButton(fTop1, "ADC Spectra of Pedestals", kButPedAdc);
-    TGTextButton *cradc  = new TGTextButton(fTop1, "ADC Spectra of Cosmics",    kButEvtAdc);
-    //TGTextButton *pedtdc = new TGTextButton(fTop3, "Run Spectra of Pedestals", kButPedTdc);
+    TGTextButton *cradc  = new TGTextButton(fTop1, "ADC Spectra of Cosmics", kButEvtAdc);
+    TGTextButton *evttdc = new TGTextButton(fTop1, "Time Spectra of Cosmics", kButEvtTdc);
     //TGTextButton *crtdc  = new TGTextButton(fTop3, "Run Spectra of Cosmics",    kButEvtTdc);
 
     //pedadc->Associate(this);
     cradc ->Associate(this);
-    //pedtdc->Associate(this);
+    evttdc->Associate(this);
     //crtdc ->Associate(this);
 
     //fList->Add(pedadc);
     fList->Add(cradc);
-    //fList->Add(pedtdc);
+    fList->Add(evttdc);
     //fList->Add(crtdc);
 
@@ -78 +78 @@
     //fTop1->AddFrame(pedadc, laybut);
     fTop1->AddFrame(cradc,  laybut);
-
+    fTop1->AddFrame(evttdc,  laybut);
     //fTop3->AddFrame(pedtdc, laybut);
     //fTop3->AddFrame(crtdc,  laybut);