Changeset 7436 for trunk/MagicSoft

Timestamp:

11/30/05 13:19:55 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/showplot.cc (modified) (2 diffs)
• include-Classes/MMcFormat/MMcFadcHeader.cxx (modified) (3 diffs)
• include-Classes/MMcFormat/MMcFadcHeader.hxx (modified) (4 diffs)
• include-Classes/MMcFormat/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/showplot.cc

@@ -163 +163 @@
         TString file = "/magic/data/";
         switch (kInput.Hash())
-
         {
-        case (unsigned long)-856860927:
+        case 3438106369:
         case  764164111:
             file += "callisto";
@@ -182 +181 @@
     }
 
-    if (kNamePs.IsNull()    && kSaveAsPs)
+    if (kNamePs.IsNull()   && kSaveAsPs)
         kNamePs = kInput;
-    if (kNamePdf.IsNull()   && kSaveAsPdf)
+    if (kNamePdf.IsNull()  && kSaveAsPdf)
         kNamePdf = kInput;
-    if (kNameSvg.IsNull()   && kSaveAsSvg)
+    if (kNameSvg.IsNull()  && kSaveAsSvg)
         kNameSvg = kInput;
-    if (kNameGif.IsNull()   && kSaveAsGif)
+    if (kNameGif.IsNull()  && kSaveAsGif)
         kNameGif = kInput;
-    if (kNameJpg.IsNull()   && kSaveAsJpg)
+    if (kNameJpg.IsNull()  && kSaveAsJpg)
         kNameJpg = kInput;
-    if (kNameXpm.IsNull()   && kSaveAsXpm)
+    if (kNameXpm.IsNull()  && kSaveAsXpm)
         kNameXpm = kInput;
-    if (kNamePng.IsNull()   && kSaveAsPng)
+    if (kNamePng.IsNull()  && kSaveAsPng)
         kNamePng = kInput;
-    if (kNameRoot.IsNull()  && kSaveAsRoot)
+    if (kNameRoot.IsNull() && kSaveAsRoot)
         kNameRoot = kInput;
-    if (kNameC.IsNull()     && kSaveAsC)
+    if (kNameC.IsNull()    && kSaveAsC)
         kNameC = kInput;
 

trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.cxx

@@ +1 @@
+/* ======================================================================== *\
+!
+! *
+! * This file is part of MARS, the MAGIC Analysis and Reconstruction
+! * Software. It is distributed to you in the hope that it can be a useful
+! * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
+! * It is distributed WITHOUT ANY WARRANTY.
+! *
+! * Permission to use, copy, modify and distribute this software and its
+! * documentation for any purpose is hereby granted without fee,
+! * provided that the above copyright notice appear in all copies and
+! * that both that copyright notice and this permission notice appear
+! * in supporting documentation. It is provided "as is" without express
+! * or implied warranty.
+! *
+!
+!
+!   Author(s): Unknown
+!
+!   Copyright: MAGIC Software Development, 2000-2005
+!
+!
+\* ======================================================================== */
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// MMcFadcHeader
+//
+// This class contains the MonteCarlo information
+// of the FADC simulation for the current run.
+// The information is saved only once, whatever the
+// number of events is
+//
+// NOTE : meaning of fAmplFadc, fAmplFadcOuter changed in camera 0.7,
+// 30/03/2004: before it was amplitude of (gaussian) pulse, now is
+// integral of pulse (which may be gaussian or not).
+//
+// In camera 0.7, the meaning of fPedesSigmaHigh, fPedesSigmaLow changed:
+// before it was the rms of the single FADC slice. Now we calculate the
+// RMS of the distribution of the sum of 14 FADC slices. The value we set
+// as fPedesSigmaHigh/Low is that RMS divided by sqrt(14). It can be seen
+// that the fluctuations of the integrated pedestal, when adding n slices
+// to obtain the pixel signal, with n>~6, is more or less well
+// approximated by sqrt(n)*RMS(sum_14)slices)/sqrt(14).
+//
+// Version 5:
+//   Added member fGainFluctuations
+//
+// Version 6:
+//   Added member fNoiseGainFluctuations
+//
+// Version 7:
+//   Derived class from MCamEvent
+//
+//////////////////////////////////////////////////////////////////////////////
 #include "MMcFadcHeader.hxx"
 
 #include <iostream>
 
-//==========
-// MMcFadcHeader
-//    
-// This class contains the MonteCarlo information
-// of the FADC simulation for the current run.
-// The information is saved only once, whatever the
-// number of events is
- 
-
-
 ClassImp(MMcFadcHeader);
 
 using namespace std;
-
 
 MMcFadcHeader::MMcFadcHeader(const char *name, const char *title) {
@@ -44 +88 @@
 }
 
-MMcFadcHeader::~MMcFadcHeader(){
-  //
-  //  default destructor
-  //
-}
-
-
 void MMcFadcHeader::Print(Option_t *Option) const {
   //
@@ -70 +107 @@
   cout << endl ; 
 }
+
+Bool_t MMcFadcHeader::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
+{
+    if ((UInt_t)idx>=GetNumPixel())
+        return kFALSE;
+
+    switch (type)
+    {
+    case 0:
+        val = fPedesMean[idx];
+        break;
+    case 1:
+        val = fPedesSigmaHigh[idx];
+        break;
+    case 2:
+        val = fPedesSigmaLow[idx];
+        break;
+    case 3:
+        val = fElecNoise[idx];
+        break;
+    case 4:
+        val = fDigitalNoise[idx];
+        break;
+    default:
+        return kFALSE;
+    }
+    return kTRUE;
+}

trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.hxx

@@ -4 +4 @@
 #ifndef MARS_MParContainer
 #include "MParContainer.h"
+#endif
+#ifndef MARS_MCamEvent
+#include "MCamEvent.h"
 #endif
 
@@ -15 +18 @@
 //   Added member fNoiseGainFluctuations
 //
+// Version 7:
+//   Derived class from MCamEvent
+//
 
-class MMcFadcHeader : public MParContainer{
+class MMcFadcHeader : public MParContainer, public MCamEvent {
  private:
 
@@ -71 +77 @@
  public:
   MMcFadcHeader(const char *name=NULL, const char *title=NULL);
-
-  ~MMcFadcHeader(); 
 
   void Print(Option_t *opt=NULL) const;
@@ -131 +135 @@
   UInt_t GetNumPixel() const { return MFADC_CHANNELS; }
 
-  ClassDef(MMcFadcHeader, 6)  //Stores Montecarlo Information describing the FADC behaviour
+  // MCamEvent
+  Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
+  void   DrawPixelContent(Int_t num) const { }
+
+  ClassDef(MMcFadcHeader, 7)  //Stores Montecarlo Information describing the FADC behaviour
 
 };
 
 #endif
-

trunk/MagicSoft/include-Classes/MMcFormat/Makefile

@@ -11 +11 @@
 #------------------------------------------------------------------------------
 
-INCLUDES = -I.  -I../mbase -I../MBase -I../mgeom
+INCLUDES = -I.  -I../mbase -I../MBase -I../mgeom -I../mgui
 
 CINT     = Mc