Changeset 2372 for trunk/MagicSoft

Timestamp:

10/02/03 23:00:51 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (6 diffs)
• mraw/MRawEvtData.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -2 +2 @@
 
   
+  2003/10/02: Thomas Bretz
+
+   * mraw/MRawEvtData.cc:
+     - changed Draw so that also lo-gains are displayed.2
+
+
+
   2003/10/01: Nicola Galante
 
@@ -18 +25 @@
 
   2003/09/30: Robert Wagner
+
    * mfileio/MCT1ReadPreProc.cc
      - undone change from 2003/09/26
@@ -55 +63 @@
 
  2003/09/26: Robert Wagner
+
    * mfileio/MCT1ReadPreProc.cc
      - provisionally pass complete event time to fTime container,
@@ -62 +71 @@
 
  2003/09/25: Abelardo Moralejo
+
    * macros/MagicHillas.C, star.C
-     - Added cast: TArrayF w(15,(Float_t*)x)  to get rid of warning.
+     - Added cast: TArrayF w(15,(Float_t*)x) to get rid of warning.
 
 
 
  2003/09/24: Abelardo Moralejo
+
    * macros/MagicHillas.C, star.C
      - Added const qualifier to TArrayF w(15,x); I got a crash due to
@@ -132 +143 @@
        'if' by a 'switch' and slightly corrected text of warning (no 
        change in performance or results).
+
+
 
  2003/09/16: Abelardo Moralejo
@@ -152 +165 @@
        correctly implemented, so this should not introduce any change
        in the analysis of present or old MC files.
+
+
 
  2003/09/12: Thomas Bretz

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -258 +258 @@
         *fLog << " of " << (int)GetNumPixels() << "Pixels" << endl;
 
-        TGraph *graph = new TGraph;
+        TGraph *graphhi = new TGraph;
 
         for (int i=0; i<nh; i++)
-            graph->SetPoint(graph->GetN(), i, higains[i]);
-
-        graph->SetMaximum(256);
-        graph->SetMinimum(0);
-
-        graph->SetBit(kCanDelete);
-        graph->Draw(same ? "C*" : "AC*");
-
-        TH1F *hist = graph->GetHistogram();
-
-        hist->SetXTitle("Time/FADC Slices");
-        hist->SetYTitle("Signal/FADC Units");
+            graphhi->SetPoint(graphhi->GetN(), i, higains[i]);
+
+        graphhi->SetMaximum(256);
+        graphhi->SetMinimum(0);
+
+        graphhi->SetBit(kCanDelete);
+        graphhi->Draw(same ? "C*" : "AC*");
+
+        TH1F *histhi = graphhi->GetHistogram();
+
+        histhi->SetXTitle("Time/FADC Slices");
+        histhi->SetYTitle("Signal/FADC Units");
+
+        if (nl>0)
+        {
+            TGraph *graphlo = new TGraph;
+
+            for (int i=0; i<nl; i++)
+                graphlo->SetPoint(graphlo->GetN(), i, logains[i]);
+
+            graphlo->SetMaximum(256);
+            graphlo->SetMinimum(0);
+            graphlo->SetLineColor(kBlue);
+
+            graphlo->SetBit(kCanDelete);
+            graphlo->Draw("C*");
+
+            TH1F *histlo = graphlo->GetHistogram();
+
+            histlo->SetXTitle("Time/FADC Slices");
+            histlo->SetYTitle("Signal/FADC Units");
+        }
 
         return;
@@ -291 +311 @@
         histh->Draw(same ? "same" : "");
 
-        if (nh>0)
+        if (nl>0)
         {
             TH1F *histl = new TH1F(name+";2", "FADC Samples", nl, -0.5, nl-.5);