Changeset 2394 for trunk/MagicSoft

Timestamp:

10/17/03 21:09:02 (21 years ago)

Author:

blanch

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/mgeom/MGeomMirror.cc (modified) (1 diff)
• include-Classes/MMcFormat/MMcFadcHeader.cxx (modified) (1 diff)
• include-Classes/MMcFormat/MMcFadcHeader.hxx (modified) (3 diffs)
• include-Classes/MMcFormat/MMcRunHeader.cxx (modified) (2 diffs)
• include-Classes/MMcFormat/MTriggerDefine.h (modified) (1 diff)

trunk/MagicSoft/Mars/mgeom/MGeomMirror.cc

@@ -105 +105 @@
 void MGeomMirror::SetMirrorDeviations(Float_t dev_x, Float_t dev_y){
     fDeviationX=dev_x;  // deviation in x [cm]
-    fDeviationY=dev_x;  // deviation in y [cm]
+    fDeviationY=dev_y;  // deviation in y [cm]
                      // of the spot of a single mirror on the camera plane
 }

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

@@ -37 +37 @@
   for(i=0;i<MFADC_CHANNELS;i++){
     fPedesMean[i]= 0.0    ;
+    fPedesSigmaHigh[i]=-1.0    ;
+    fPedesSigmaLow[i]=-1.0    ;
     fElecNoise[i]=-1.0   ;
   }

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

@@ -20 +20 @@
   Float_t  fPedesMean[MFADC_CHANNELS]    ;  //  The mean value for the pedestal
                                             //  of each pixel (channel)
+  Float_t  fPedesSigmaHigh[MFADC_CHANNELS]    ; //  The sigma for the pedestal
+                                                //  of each pixel (channel)
+  Float_t  fPedesSigmaLow[MFADC_CHANNELS]    ;  //  The sigma for the pedestal
+                                                //  of each pixel (channel)
   Float_t  fElecNoise[MFADC_CHANNELS]   ;  //  The rms value in the pedestal 
                                            //  due to the electronics for
@@ -55 +59 @@
   }
 
+  void SetPedestalSigma(Float_t *sigmalo, Float_t *sigmahi, Int_t dim){
+    for (Int_t i=0;i<dim;i++){
+      fPedesSigmaLow[i]=sigmalo[i];
+      fPedesSigmaHigh[i]=sigmahi[i];
+    }
+  }
+
   void SetElecNoise(Float_t *sigma, Int_t dim){
     for (Int_t i=0;i<dim;i++)
@@ -61 +72 @@
   
   Float_t GetPedestal(UInt_t i) const    { return fPedesMean[i]; }
-  Float_t GetPedestalRms(UInt_t i) const { return fElecNoise[i]; }
+  Float_t GetPedestalRmsHigh(UInt_t i) const { return fPedesSigmaHigh[i]; }
+  Float_t GetPedestalRmsLow(UInt_t i) const { return fPedesSigmaLow[i]; }
+  Float_t GetElecNoise(UInt_t i) const { return fElecNoise[i]; }
   Float_t GetAmplitud() const { return fAmplFadc; }
 

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

@@ -103 +103 @@
     fNumSimulatedShowers = 0;
     fNumStoredShowers = 0;
+    fNumEvents = 0;
 
     fStarFieldRaH = 0;
@@ -206 +207 @@
     fNumSimulatedShowers = numsim;
     fNumStoredShowers = numsto;
+    fNumEvents = numsto;
 
     fStarFieldRaH = sfRaH;

trunk/MagicSoft/include-Classes/MMcFormat/MTriggerDefine.h

@@ -9 +9 @@
 #define TRIGGER_PIXELS_5      397
 #define TRIGGER_PIXELS_6      1657
-#define TRIGGER_PIXELS_8      100
-#define TRIGGER_PIXELS_9      100
+#define TRIGGER_PIXELS_8      126
+#define TRIGGER_PIXELS_9      126
 //
 //      This is the number of Pixels contributing to the TRIGGER logic