Changeset 4459 for trunk/MagicSoft

Timestamp:

08/04/04 11:59:54 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• star.cc (modified) (9 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -41 +41 @@
      - removed the MBlind* entries
 
-   * mmain/MEventDisplay.cc, mmain/MOnlineDisplay.cc:
+   * star.cc, mmain/MEventDisplay.cc, mmain/MOnlineDisplay.cc, 
+     mmain/MAnalysis.cc, mfileio/MCT1ReadPreProc.[h,cc]:
      - removed usage of MBlind*
+     - MBadPixel* TO BE ADDED
 
    * merpp.cc:
@@ -80 +82 @@
      - implemented scaled image cleaning
      - replaced usage of MSigmabar by MPedPhotCam for democratic cleaning
+
+   * manalysisct1, manalysisct1/Makefile, 
+     manalysisct1/AnalysisCT1LinkDef.h:
+     - new
+
+   * manalysis/MCT1*:
+     - moved to new directory manalysisct1
+
+   * manalysis/Makefile, manalysis/AnalysisLinkDef.h:
+     - updated
+     - removed MPad because long time ago changed discuseed were not made
+       (it doesn't compile anymore, because MBlindPixels is missing now)
 
 

trunk/MagicSoft/Mars/star.cc

@@ -18 +18 @@
 #include "MCerPhotCalc.h"
 #include "MCerPhotAnal2.h"
-#include "MBlindPixelCalc.h"
 #include "MSigmabarCalc.h"
 #include "MImgCleanStd.h"
@@ -198 +197 @@
         nanal.SetFilter(&f2);
 
-        MBlindPixelCalc   blind;
         MSigmabarCalc     sgcal;
         //MFillH            fills("MHSigmaTheta",  "", "FillSigmaTheta");
@@ -216 +214 @@
         tlist.AddToList(&ncalc);
         tlist.AddToList(&nanal);
-        tlist.AddToList(&blind);
         tlist.AddToList(&sgcal);
         //tlist.AddToList(&fills);
@@ -233 +230 @@
         // Setup tasks
         //
-        blind.SetUseInterpolation();
-
         write.AddContainer(write.AddSerialNumber("MMcEvt"),       "Events", kFALSE);
         write.AddContainer(write.AddSerialNumber("MSigmabar"),    "Events");
@@ -267 +262 @@
 
         //plist.FindObject("MHSigmaTheta")->Write();
-        //plist.FindObject("MHBlindPixels")->Write();
 
         gLog << all << "Star finished successfull!" << endl;
@@ -405 +399 @@
     nanal.SetFilter(&f2);
 
-    MBlindPixelCalc   blind;
     MSigmabarCalc     sgcal;
     //MFillH            fills("MHSigmaTheta",  "", "FillSigmaTheta");
-    //MFillH            fillb("MHBlindPixels", "", "FillBlindPixels");
     MImgCleanStd      clean;
     MHillasCalc       hcalc;
@@ -423 +415 @@
     tlist.AddToList(&ncalc);
     tlist.AddToList(&nanal);
-    tlist.AddToList(&blind);
     tlist.AddToList(&sgcal);
     //tlist.AddToList(&fills);
@@ -440 +431 @@
     // Setup tasks
     //
-    blind.SetUseInterpolation();
 
     write.AddContainer(write.AddSerialNumber("MMcEvt"),       "Events", kFALSE);
@@ -474 +464 @@
 
     //plist.FindObject("MHSigmaTheta")->Write();
-    //plist.FindObject("MHBlindPixels")->Write();
 
     gLog << all << "Star finished successfull!" << endl;