Makefix

source/Makefile

@@ -103,7 +103,6 @@ MCPPROCESSORO    = McpProcessor.$(ObjSuf)
 MTCPROCESSORO    = MtcProcessor.$(ObjSuf)
 DSSDPROCESSORO   = DssdProcessor.$(ObjSuf)
 SSDPROCESSORO    = SsdProcessor.$(ObjSuf)
-MTASMUONPROCESSORO  = MtasMuonProcessor.$(ObjSuf)
 MTASPROCESSORO   = MtasProcessor.$(ObjSuf)
 TRACESUBO        = TraceAnalyzer.$(ObjSuf)
 DETECTORDRIVERO  = DetectorDriver.$(ObjSuf)
@@ -112,7 +111,6 @@ RAWEVENTO        = RawEvent.$(ObjSuf)
 ROOTPROCESSORO   = RootProcessor.$(ObjSuf)
 RANDOMPOOLO      = RandomPool.$(ObjSuf)
 STATSDATAO       = StatsData.$(ObjSuf)
-WAVEFORMPROCESSORO = WaveformProcessor.$(ObjSuf)
 PULSERPROCESSORO   = PulserProcessor.$(ObjSuf)
 #THERMPROCESSORO  = ThermometerProcessor.$(ObjSuf)
 
@@ -137,8 +135,7 @@ OBJS   = $(READBUFFDATAO) $(SET2CCO) $(DSSDSUBO) $(DETECTORDRIVERO) \
 	$(HISTOGRAMMERO) $(EVENTPROCESSORO) $(SCINTPROCESSORO) \
 	$(GEPROCESSORO) $(SPLINEFITPROCESSORO) $(SPLINEPROCESSORO) \
 	$(DSSDPROCESSORO) $(SSDPROCESSORO) $(RAWEVENTO) $(RANDOMPOOLO) \
-	$(MTASPROCESSORO) $(MTASMUONPROCESSORO) $(STATSDATAO) \
-	$(WAVEFORMPROCESSORO) $(PULSERPROCESSORO) 
+	$(MTASPROCESSORO) $(STATSDATAO) $(PULSERPROCESSORO) 
 	#$(THERMPROCESSORO)
 
 #$(VANDLEPROCESSORO) $(PULSERPROCESSORO)

source/include/damm_plotids.h

@@ -121,10 +121,6 @@ namespace dammIds {
 	const int DD_TDIFFVSCORCORTOF = 2470;
 	const int DD_TQDCAVEVSCORTOF  = 2510;
     }//vandle namespace
-    namespace waveformprocessor{
-	const int D_DISCRIM     = 5100;
-	const int DD_NGVSE      = 5101;
-    } // waveformprocessor namespace
     namespace pulserprocessor{ //in PulserProcessor.cpp 
 	const int D_TIMEDIFF     = 5000;
 	const int D_PROBLEMSTUFF = 5001;
@@ -176,8 +172,8 @@ namespace dammIds {
 	const int MTAS_EVO_NOLOGIC = 3600;
 	const int MTAS_LIGHTPULSER_EVO = 3700;
 	const int MTAS_REFERENCE_EVO = 3800;
-	//For MtasMuonProcessor 1D (4000-4299) 
-	const int MTAS_TOTAL = 4000;
+	//For MtasMuonProcessor 1D (4000-4299) //keeping incase we want to rename things.
+	/*const int MTAS_TOTAL = 4000;
 	const int MTAS_CENTRAL = 4001;
 	const int MTAS_INNER = 4002;
 	const int MTAS_MIDDLE = 4003;
@@ -232,7 +228,7 @@ namespace dammIds {
 	const int MTAS_PREV_TMULT_V_E = 4311;
 	const int MTAS_CURR_IMULT_V_E = 4312;
 	const int MTAS_CURR_MOMULT_V_E = 4313;
-	const int MTAS_CURR_IDE_V_E = 4314;
+	const int MTAS_CURR_IDE_V_E = 4314;*/
 
     } // mtas namespace
 

source/src/DeclareHistogram.cpp

@@ -75,7 +75,6 @@ extern "C" void drrsub_(unsigned int& iexist)
     // unfortunately this function is called before we have read in the map,
     //   and know the EXACT number of channels we'll need
     const int numberChannels = 96;
-    const int stripsDSSD = 40;
 
     extern DetectorDriver driver;
 
@@ -91,11 +90,6 @@ extern "C" void drrsub_(unsigned int& iexist)
         DeclareHistogram1D(offsets::D_CAL_ENERGY+i,SE,"Channel Cal. Energy");	    
     }
 
-    // not needed for MTAS, Jan '12, DTM
-    //for (int i=0; i < stripsDSSD; i++) {
-	//DeclareHistogram1D(offsets::D_FRONT_STRIP + i, SE, "dssd front");
-	//DeclareHistogram1D(offsets::D_BACK_STRIP + i, SE, "dssd back");
-    //}
 
     DeclareHistogram1D(D_HIT_SPECTRUM, S7, "channel hit spectrum");
     DeclareHistogram1D(D_SUBEVENT_GAP, SE, "time btwn chan-in event,10ns bin");

source/src/DetectorDriver.cpp

@@ -17,7 +17,7 @@
       SVP - Oct. '10
             Added the VandleProcessor for use with VANDLE.
             Added the PulserProcessor for use with Pulsers.
-            Added the WaveformProcessor to determine ps time resolutions.
+
 */
 
 /*!
@@ -47,12 +47,10 @@
 #include "DssdProcessor.h"
 #include "SsdProcessor.h"
 #include "MtasProcessor.h"
-#include "MtasMuonProcessor.h"
 #include "GeProcessor.h"
 #include "McpProcessor.h"
 #include "MtcProcessor.h"
 #include "ScintProcessor.h"
-#include "WaveformProcessor.h"
 //#include "VandleProcessor.h"
 //#include "PulserProcessor.h"
 
@@ -78,7 +76,6 @@ extern RandomPool randoms;
 */
 DetectorDriver::DetectorDriver()
 {
-//    vecProcess.push_back(new WaveformProcessor());
 //    vecProcess.push_back(new ScintProcessor());
 //    vecProcess.push_back(new GeProcessor());
 //    vecProcess.push_back(new McpProcessor());