Changeset 6856

Timestamp:

03/18/05 17:40:59 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mmain/MCameraDisplay.cc (modified) (1 diff)
• mmain/MEventDisplay.cc (modified) (6 diffs)
• mmain/MainLinkDef.h (modified) (1 diff)
• mmain/Makefile (modified) (1 diff)
• msignal/MArrivalTimeCam.cc (modified) (1 diff)
• msignal/MSignalCalc.cc (added)
• msignal/MSignalCalc.h (added)
• msignal/MSignalCam.cc (added)
• msignal/MSignalCam.h (added)
• msignal/MSignalPix.cc (added)
• msignal/MSignalPix.h (added)
• msignal/Makefile (modified) (1 diff)
• msignal/SignalLinkDef.h (modified) (1 diff)
• msql/SqlLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/mmain/MCameraDisplay.cc

@@ -57 +57 @@
     fTop2->AddFrame(disp, laybut);
 
+/*
+    const TGPicture *pic2 = fList->GetPicture("marslogo.xpm");
+    if (pic2)
+    {
+        TGPictureButton *mars  = new TGPictureButton(fTop2, pic2, -1);
+        fList->Add(mars);
+        TGLayoutHints *lay2 = new TGLayoutHints(kLHintsRight, 10, 10, 10, 10);
+        fList->Add(lay2);
+        fTop2->AddFrame(mars,  lay2);
+    }
+  */
     MapSubwindows();
 

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -70 +70 @@
 #include "MMcPedestalNSBAdd.h"    // MMcPedestalNSBAdd
 
-#include "MCerPhotAnal2.h"        // MPedestalCalc
+#include "MSignalCalc.h"          // MPedestalCalc
 #include "MTaskEnv.h"             // MTaskEnv
 #include "MExtractTimeAndChargeDigitalFilter.h"
@@ -159 +159 @@
         return -1;
 
-    if (t->FindBranch("MCerPhotEvt."))
+    if (t->FindBranch("MSignalCam."))
         return 1;
 
@@ -253 +253 @@
     taskenv1->SetOwner();
 
-    MCerPhotAnal2      *nanal  = new MCerPhotAnal2;
-    MFillH             *fill01 = new MFillH(evt01, "MCerPhotEvt", "MFillH01");
+    MSignalCalc        *nanal  = new MSignalCalc;
+    MFillH             *fill01 = new MFillH(evt01, "MSignalCam", "MFillH01");
     MImgCleanStd       *clean  = new MImgCleanStd;
-    MFillH             *fill02 = new MFillH(evt02, "MCerPhotEvt", "MFillH02");
+    MFillH             *fill02 = new MFillH(evt02, "MSignalCam", "MFillH02");
     MFillH             *fill03 = new MFillH(evt03, type==1?"MPedPhotFundamental":"MPedestalCam",       "MFillH03");
     MFillH             *fill04 = new MFillH(evt04, type==1?"MPedPhotFromExtractorRndm":"MPedestalCam", "MFillH04");
@@ -264 +264 @@
     MMcTriggerLvl2Calc *trcal  = new MMcTriggerLvl2Calc;
     MFillH             *fill09 = new MFillH(evt09, "MMcTriggerLvl2", "MFillH09");
-    MFillH             *fill10 = new MFillH(evt10, "MCerPhotEvt",    "MFillH10");
+    MFillH             *fill10 = new MFillH(evt10, "MSignalCam",    "MFillH10");
 
     MBadPixelsCalc     *bcalc  = new MBadPixelsCalc;
@@ -306 +306 @@
         tlist->AddToList(taskenv1); // Calculates MExtractedSignalCam, MArrivalTimeCam
         tlist->AddToList(mcupd);
-        tlist->AddToList(calib);    // MExtractedSignalCam --> MCerPhotEvt
+        tlist->AddToList(calib);    // MExtractedSignalCam --> MSignalCam
 
         tlist->AddToList(bcalc);    // Produce MBadPixelsCam
@@ -332 +332 @@
     if (type==1)
     {
-        MFillH *fill08 = new MFillH(evt08, "MArrivalTime", "MFillH8");
+        MFillH *fill08 = new MFillH(evt08, "MSignalCam", "MFillH8");
         tlist->AddToList(fill08);
     }

trunk/MagicSoft/Mars/mmain/MainLinkDef.h

@@ -7 +7 @@
 #pragma link C++ class MBrowser+;
 
-#pragma link C++ class MMars+;
-#pragma link C++ class MAnalysis+;
-#pragma link C++ class MDataCheck+;
-#pragma link C++ class MMonteCarlo+;
-
 #pragma link C++ class MCameraDisplay+;
 #pragma link C++ class MEventDisplay+;
-#pragma link C++ class MOnlineDisplay+;
-#pragma link C++ class MOnlineDump+;
-
-#pragma link C++ class MGDisplayAdc+;
 
 #endif

trunk/MagicSoft/Mars/mmain/Makefile

@@ -26 +26 @@
 
 SRCFILES = MBrowser.cc \
-           MDataCheck.cc \
-           MMars.cc \
-           MAnalysis.cc \
-           MMonteCarlo.cc \
-           MGDisplayAdc.cc \
-           MEventDisplay.cc \
-           MOnlineDisplay.cc \
-           MOnlineDump.cc \
+           MEventDisplay.cc \
            MCameraDisplay.cc
 

trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.cc

@@ -153 +153 @@
         break;
     case 4:
+    case 6:
         if ((*this)[idx].GetNumHiGainSaturated() > 0)
             val = (*this)[idx].GetArrivalTimeLoGain();

trunk/MagicSoft/Mars/msignal/Makefile

@@ -53 +53 @@
            MExtractTimeAndChargeDigitalFilter.cc \
            MExtractTimeAndChargeDigitalFilterPeakSearch.cc \
+           MSignalCam.cc \
+           MSignalPix.cc \
+           MSignalCalc.cc \
            MArrivalTimeCam.cc \
            MArrivalTimePix.cc

trunk/MagicSoft/Mars/msignal/SignalLinkDef.h

@@ -35 +35 @@
 #pragma link C++ class MExtractTimeAndChargeDigitalFilterPeakSearch+;
 
-
 #pragma link C++ class MArrivalTimeCam+;
 #pragma link C++ class MArrivalTimePix+;
 
+#pragma link C++ class MSignalPix+;
+#pragma link C++ class MSignalCam+;
+#pragma link C++ class MSignalCamIter+;
+#pragma link C++ class MSignalCalc+;
+
 #endif

trunk/MagicSoft/Mars/msql/SqlLinkDef.h

@@ -5 +5 @@
 #pragma link off all functions;
 
-#pragma link C++ class MSqlInsertRun+;
-
 #pragma link C++ class MSQLColumn+;
 #pragma link C++ class MSQLServer+;