Changeset 7061 for trunk

Timestamp:

05/19/05 11:55:44 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mmain/MEventDisplay.cc (modified) (8 diffs)
• msignal/MExtractTimeAndChargeSpline.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
      - simplified a really cryptical use of the ?:-operator when
        the fLoGainFirst is calculated
+     - fixed a bug introduced in the calculation of the derivatives
+
+   * mmain/MEventDisplay.cc:
+     - removed MC trigger display
 
 

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -83 +83 @@
 #include "MMcCalibrationUpdate.h" // MMcCalibrationUpdate
 #include "MCalibrateData.h"       // MCalibrateData
-#include "MMcTriggerLvl2Calc.h"   // MMcTriggerLvl2Calc
+//#include "MMcTriggerLvl2Calc.h"   // MMcTriggerLvl2Calc
 
 //
@@ -100 +100 @@
 #include "MPedPhotCam.h"           // MPedPhotCam
 #include "MCalibrationChargeCam.h" // MCalibrationChargeCam
-#include "MMcTriggerLvl2.h"        // MMcTriggerLvl2
+//#include "MMcTriggerLvl2.h"        // MMcTriggerLvl2
 
 using namespace std;
@@ -220 +220 @@
     MHEvent *evt07 = new MHEvent(MHEvent::kEvtIdxMax);
     MHEvent *evt08 = new MHEvent(MHEvent::kEvtArrTime);
-    MHEvent *evt09 = new MHEvent(MHEvent::kEvtTrigPix);
+    //MHEvent *evt09 = new MHEvent(MHEvent::kEvtTrigPix);
     MHEvent *evt10 = new MHEvent(MHEvent::kEvtIslandIndex);
 
@@ -231 +231 @@
     evt07->SetName("Max Slice Idx");
     evt08->SetName("Arrival Time");
-    evt09->SetName("Trigger");
+    //evt09->SetName("Trigger");
     evt10->SetName("Islands");
 
@@ -243 +243 @@
     plist->AddToList(evt07);
     plist->AddToList(evt08);
-    plist->AddToList(evt09);
+    //plist->AddToList(evt09);
     plist->AddToList(evt10);
 
@@ -262 +262 @@
     MFillH             *fill06b= new MFillH(evt06b, "MCameraData", "MFillH06b");
     MHillasCalc        *hcalc  = new MHillasCalc;
-    MMcTriggerLvl2Calc *trcal  = new MMcTriggerLvl2Calc;
-    MFillH             *fill09 = new MFillH(evt09, "MMcTriggerLvl2", "MFillH09");
+    //MMcTriggerLvl2Calc *trcal  = new MMcTriggerLvl2Calc;
+    //MFillH             *fill09 = new MFillH(evt09, "MMcTriggerLvl2", "MFillH09");
     MFillH             *fill10 = new MFillH(evt10, "MSignalCam",    "MFillH10");
 
@@ -296 +296 @@
         // MC
         mcupd->SetFilter(f1);
-        trcal->SetFilter(f1);
+        //trcal->SetFilter(f1);
 
         // TaskList
@@ -327 +327 @@
         tlist->AddToList(fill08);
 
-        tlist->AddToList(trcal);
-        tlist->AddToList(fill09);
+        //tlist->AddToList(trcal);
+        //tlist->AddToList(fill09);
     }
     if (type==1)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc

@@ -369 +369 @@
                                                           Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag)
 {
-  
   Int_t range = fHiGainLast - fHiGainFirst + 1;
   const Byte_t *end = first + range;
@@ -442 +441 @@
       const Float_t pp = fHiGainSecondDeriv[i-1] + 4.;
       fHiGainSecondDeriv[i] = -1.0/pp;
-      fHiGainFirstDeriv [i] = 2*(fHiGainSignal[i+1] - fHiGainSignal[i]);
+      fHiGainFirstDeriv [i] = fHiGainSignal[i+1] - 2*fHiGainSignal[i] + fHiGainSignal[i-1];
       fHiGainFirstDeriv [i] = (6.0*fHiGainFirstDeriv[i]-fHiGainFirstDeriv[i-1])/pp;
     }
@@ -724 +723 @@
                                                           Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag) 
 {
-  
   Int_t range = fLoGainLast - fLoGainFirst + 1;
   const Byte_t *end = first + range;
@@ -768 +766 @@
       const Float_t pp = fLoGainSecondDeriv[i-1] + 4.;
       fLoGainSecondDeriv[i] = -1.0/pp;
-      fLoGainFirstDeriv [i] = 2*(fLoGainSignal[i+1] - fLoGainSignal[i]);
+      fLoGainFirstDeriv [i] = fLoGainSignal[i+1] - 2*fLoGainSignal[i] + fLoGainSignal[i-1];
       fLoGainFirstDeriv [i] = (6.0*fLoGainFirstDeriv[i]-fLoGainFirstDeriv[i-1])/pp;
     }