Changeset 7082 for trunk

Timestamp:

05/20/05 16:54:34 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Makefile.conf.general (modified) (1 diff)
• NEWS (modified) (1 diff)
• manalysis/MCameraData.cc (modified) (2 diffs)
• manalysis/MCameraData.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Makefile.conf.general

@@ -18 +18 @@
 #   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
 #
-DEFINES  = -DMARSVER=\"0.9.2\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
+DEFINES  = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
 
 CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)

trunk/MagicSoft/Mars/NEWS

@@ -1 +1 @@
                                                                -*-*- END -*-*-
+
+ *** Version <cvs>
+
+
 
  *** Version 0.9.2

trunk/MagicSoft/Mars/manalysis/MCameraData.cc

@@ -48 +48 @@
 #include "MSignalPix.h"
 
-#include "MSigmabar.h"
-
 ClassImp(MCameraData);
 
@@ -185 +183 @@
 }
 
-
-void MCameraData::CalcCleaningLevel(const MSignalCam &evt, const MSigmabar &sgb,
-                                    const MGeomCam &geom)
-{
-    CalcCleaningLevel(evt, sgb.GetSigmabarInner(), geom);
-}
-
 void MCameraData::CalcCleaningLevel(const MSignalCam &evt, Double_t noise,
                                     const MGeomCam &geom)

trunk/MagicSoft/Mars/manalysis/MCameraData.h

@@ -16 +16 @@
 
 class MGeomCam;
-class MSigmabar;
 class MSignalCam;
 class MPedPhotCam;
@@ -33 +32 @@
 
     void CalcCleaningLevel(const MSignalCam &evt, const MPedPhotCam &fCam,
-                           const MGeomCam &geom);
-    void CalcCleaningLevel(const MSignalCam &evt, const MSigmabar &sgb,
                            const MGeomCam &geom);
     void CalcCleaningLevel(const MSignalCam &evt, Double_t noise,