Changeset 7896 for trunk/MagicSoft

Timestamp:

08/21/06 15:07:58 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/Makefile (modified) (2 diffs)
• msignal/SignalLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -31 +31 @@
    * msignal/MExtractTimeAndChargeSpline.[h,cc]:
      - made sure that dsum is always set correctly
+
+   * msignal/Makefile, msignal/SignalDef.h:
+     - took out the following classes from make:
+       + MExtractFixedWindow
+       + MExtractSlidingWindow
+       + MExtractFixedWindowPeakSearch
+       + MExtractFixedWindowSpline
+       + MExtractAmplitudeSpline
+       + MExtractTimeFastSpline
+       + MExtractTimeHighestIntegral
+       + MExtractTimeAndChargeSlidingWindow
+       + MExtractTimeAndChargeDigitalFilterPeakSearch
 
 

trunk/MagicSoft/Mars/msignal/Makefile

@@ -34 +34 @@
            MExtractedSignalBlindPixel.cc \
            MExtractor.cc \
-           MExtractFixedWindow.cc \
-           MExtractSlidingWindow.cc \
-           MExtractFixedWindowPeakSearch.cc \
-           MExtractFixedWindowSpline.cc \
-           MExtractAmplitudeSpline.cc \
            MExtractPINDiode.cc \
            MExtractBlindPixel.cc \
            MExtractTime.cc \
            MExtractTimeSpline.cc \
-           MExtractTimeFastSpline.cc \
-           MExtractTimeHighestIntegral.cc \
            MExtractTimeAndCharge.cc \
-           MExtractTimeAndChargeSlidingWindow.cc \
            MExtractTimeAndChargeSpline.cc \
            MExtractTimeAndChargeDigitalFilter.cc \
-           MExtractTimeAndChargeDigitalFilterPeakSearch.cc \
            MSignalCam.cc \
            MSignalPix.cc \
@@ -61 +52 @@
 #           MExtractSignalABcorr.cc \
 
+#           MExtractFixedWindow.cc \
+#           MExtractSlidingWindow.cc \
+#           MExtractFixedWindowPeakSearch.cc \
+#           MExtractFixedWindowSpline.cc \
+#           MExtractAmplitudeSpline.cc \
+#           MExtractTimeFastSpline.cc \
+#           MExtractTimeHighestIntegral.cc \
+#           MExtractTimeAndChargeSlidingWindow.cc \
+#           MExtractTimeAndChargeDigitalFilterPeakSearch.cc \
+
 ############################################################
 

trunk/MagicSoft/Mars/msignal/SignalLinkDef.h

@@ -16 +16 @@
 
 #pragma link C++ class MExtractor+;
-#pragma link C++ class MExtractFixedWindow+;
-#pragma link C++ class MExtractSlidingWindow+;
-#pragma link C++ class MExtractFixedWindowPeakSearch+;
-#pragma link C++ class MExtractFixedWindowSpline+;
-#pragma link C++ class MExtractAmplitudeSpline+;
 #pragma link C++ class MExtractPINDiode+;
 #pragma link C++ class MExtractBlindPixel+;
 
+//#pragma link C++ class MExtractFixedWindow+;
+//#pragma link C++ class MExtractSlidingWindow+;
+//#pragma link C++ class MExtractFixedWindowPeakSearch+;
+//#pragma link C++ class MExtractFixedWindowSpline+;
+//#pragma link C++ class MExtractAmplitudeSpline+;
+
 #pragma link C++ class MExtractTime+;
-#pragma link C++ class MExtractTimeSpline+;
-#pragma link C++ class MExtractTimeFastSpline+;
-#pragma link C++ class MExtractTimeHighestIntegral+;
+//#pragma link C++ class MExtractTimeSpline+;
+//#pragma link C++ class MExtractTimeFastSpline+;
+//#pragma link C++ class MExtractTimeHighestIntegral+;
 
 #pragma link C++ class MExtractTimeAndCharge+;
-#pragma link C++ class MExtractTimeAndChargeSlidingWindow+;
 #pragma link C++ class MExtractTimeAndChargeSpline+;
 #pragma link C++ class MExtractTimeAndChargeDigitalFilter+;
-#pragma link C++ class MExtractTimeAndChargeDigitalFilterPeakSearch+;
+//#pragma link C++ class MExtractTimeAndChargeSlidingWindow+;
+//#pragma link C++ class MExtractTimeAndChargeDigitalFilterPeakSearch+;
 
 #pragma link C++ class MArrivalTimeCam+;