Index: trunk/FACT++/Makefile.am =================================================================== --- trunk/FACT++/Makefile.am (revision 11982) +++ trunk/FACT++/Makefile.am (revision 11983) @@ -38,5 +38,5 @@ chatclient chatserv \ biasctrl \ - mcp feedback \ + mcp \ fitsdump @@ -269,9 +269,4 @@ libConfiguration.la -feedback_SOURCES = src/feedback.cc src/LocalControl.h -feedback_LDADD = libDim.la libDim++.la libDimExtension.la \ - libTime.la libTools.la libStateMachine.la \ - libConfiguration.la - argv_SOURCES = src/argv.cc Index: trunk/FACT++/Makefile.in =================================================================== --- trunk/FACT++/Makefile.in (revision 11982) +++ trunk/FACT++/Makefile.in (revision 11983) @@ -52,7 +52,6 @@ fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) fsc$(EXEEXT) \ chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \ - mcp$(EXEEXT) feedback$(EXEEXT) fitsdump$(EXEEXT) \ - $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ - $(am__EXEEXT_4) + mcp$(EXEEXT) fitsdump$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ + $(am__EXEEXT_3) $(am__EXEEXT_4) @HAS_GUI_TRUE@am__append_1 = fact @HAS_VIEWER_TRUE@am__append_2 = viewer @@ -271,8 +270,4 @@ fadctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \ libTime.la libTools.la libStateMachine.la libConfiguration.la -am_feedback_OBJECTS = src/feedback.$(OBJEXT) -feedback_OBJECTS = $(am_feedback_OBJECTS) -feedback_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \ - libTime.la libTools.la libStateMachine.la libConfiguration.la am_fitsdump_OBJECTS = src/fitsdump.$(OBJEXT) fitsdump_OBJECTS = $(am_fitsdump_OBJECTS) @@ -398,11 +393,10 @@ $(dimctrl_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \ $(dserver2_SOURCES) $(fact_SOURCES) $(fad_SOURCES) \ - $(fadctrl_SOURCES) $(feedback_SOURCES) $(fitsdump_SOURCES) \ - fitsgrep.c $(fitsloader_SOURCES) $(fsc_SOURCES) \ - $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \ - $(log_SOURCES) $(logtime_SOURCES) $(mcp_SOURCES) \ - $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \ - $(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES) \ - $(viewer_SOURCES) + $(fadctrl_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \ + $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \ + $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \ + $(logtime_SOURCES) $(mcp_SOURCES) $(readfits_SOURCES) sched.c \ + $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \ + $(triggerschedule_SOURCES) $(viewer_SOURCES) DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \ $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \ @@ -414,9 +408,8 @@ $(drivectrl_SOURCES) $(dserver2_SOURCES) \ $(am__fact_SOURCES_DIST) $(fad_SOURCES) \ - $(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \ - $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \ - $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \ - $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \ - $(mcp_SOURCES) $(readfits_SOURCES) sched.c \ + $(am__fadctrl_SOURCES_DIST) $(fitsdump_SOURCES) fitsgrep.c \ + $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \ + $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \ + $(logtime_SOURCES) $(mcp_SOURCES) $(readfits_SOURCES) sched.c \ $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \ $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST) @@ -859,9 +852,4 @@ libConfiguration.la -feedback_SOURCES = src/feedback.cc src/LocalControl.h -feedback_LDADD = libDim.la libDim++.la libDimExtension.la \ - libTime.la libTools.la libStateMachine.la \ - libConfiguration.la - argv_SOURCES = src/argv.cc argv_LDADD = libConfiguration.la @@ -1303,9 +1291,4 @@ @rm -f fadctrl$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(fadctrl_OBJECTS) $(fadctrl_LDADD) $(LIBS) -src/feedback.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) -feedback$(EXEEXT): $(feedback_OBJECTS) $(feedback_DEPENDENCIES) - @rm -f feedback$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(feedback_OBJECTS) $(feedback_LDADD) $(LIBS) src/fitsdump.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -1529,5 +1512,4 @@ -rm -f src/fad.$(OBJEXT) -rm -f src/fadctrl.$(OBJEXT) - -rm -f src/feedback.$(OBJEXT) -rm -f src/fitsdump.$(OBJEXT) -rm -f src/fitsloader.$(OBJEXT) @@ -1639,5 +1621,4 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fad.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fadctrl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/feedback.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsdump.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsloader.Po@am__quote@ Index: trunk/FACT++/ftmctrl.rc =================================================================== --- trunk/FACT++/ftmctrl.rc (revision 11982) +++ trunk/FACT++/ftmctrl.rc (revision 11983) @@ -1,62 +1,2 @@ -console=2 - -run-type=data -run-type=pedestal -run-type=drs-calib - -sampling-frequency.default = 2000 - -ftu-report-interval.default = 100 - - -[trigger] -enable-trigger.default = yes -enable-trigger.pedestal = no -enable-trigger.drs-calib = no - -enable-external-1.default = no -enable-external-2.default = no -enable-veto.default = no -enable-clock-conditioner.default = no - -multiplicity-physics.default = 1 -multiplicity-calib.default = 40 -coincidence-window-physics.default = 10 -coincidence-window-calib.default = 10 -dead-time.default = 25 -delay.default = 25 -time-marker-delay.default = 25 - -#disable-patch.default = -#disable-pixel.default = - - -[trigger.threshold] - -patch.default = 150 -logic.default = 16 - - -[trigger.sequence] -interval.default = 50 -pedestal.default = 0 -lp-int.default = 0 -lp-ext.default = 0 - - -[light-pulser.external] - -intensity.default = 100 -enable-group1.default = no -enable-group2.default = no - - -[light-pulser.internal] - -intensity.default = 10 -enable-group1.default = no -enable-group2.default = no - - [clock-conditioner] frequency = 800 @@ -96,3 +36,2 @@ R15.4000 = 0x1400fa0f R15.5000 = 0x0802710f - Index: trunk/FACT++/src/RemoteControl.h =================================================================== --- trunk/FACT++/src/RemoteControl.h (revision 11982) +++ trunk/FACT++/src/RemoteControl.h (revision 11983) @@ -121,6 +121,4 @@ { } - - //void SetReceiver(void *) { } bool PrintGeneralHelp() Index: trunk/FACT++/src/argv.cc =================================================================== --- trunk/FACT++/src/argv.cc (revision 11982) +++ trunk/FACT++/src/argv.cc (revision 11983) @@ -4,36 +4,4 @@ using namespace std; - -template -std::ostream &operator<<(std::ostream &out, const pair &f) -{ - out << f.first << "|" << f.second; - return out; -} -template -std::istream &operator>>(std::istream &in, pair &f) -{ - char c; - in >> f.first; - in >> c; - if (c!=':') - return in; - in >> f.second; - return in; -} - -typedef pair mytype; - - -//Source is OutputStreamable, meaning that an operator<< is defined -// that takes a std::ostream or std::wostream object on the left hand side -// and an instance of the argument type on the right. - -// Target is InputStreamable, meaning that an operator>> is defined that -// takes a std::istream or std::wistream object on the left hand side and -// an instance of the result type on the right. - -//Target is CopyConstructible [20.1.3]. -//Target is DefaultConstructible, meaning that it is possible to default-initialize an object of that type [8.5, 20.1.4]. // -------------------------------------------------------------------------- @@ -99,7 +67,4 @@ po::options_description config("Configuration"); config.add_options() - ("xxx", vars(), "Print available commandline options.") - ("test.*", var(), "Print available commandline options.") - ("map.*", var(), "Print available commandline options.") ("compression", var(), "set compression level") ("optimization", var(10, &opt), "optimization level") @@ -117,5 +82,4 @@ ("switch", po_switch(), "include path") ("bool", var()->implicit_value(true), "include path") - ("mytype", var(), "include path") ; @@ -206,31 +170,6 @@ cout << "Program " << argv[0] << " started successfully." << endl; - cout << conf.Has("test.A") << " " << conf.Get("test.A") << endl; - cout << conf.Has("test.%") << " " << conf.Get("test.%") << endl; - cout << conf.Has("test.9") << " " << conf.Get("test.9") << endl; - cout << conf.Has("test.data") << " " << conf.Get("test.data") << endl; - cout << conf.Has("test.pedestal") << " " << conf.Get("test.pedestal") << endl; - cout << conf.Has("map.1") << " " << conf.Get("map.1") << endl; - cout << conf.Has("map.2") << " " << conf.Get("map.2") << endl; - - return 0; - cout << conf.Has("switch") << " " << conf.Get("switch") << endl; - cout << conf.Has("bool") << " " << conf.Get("bool") << endl; - cout << conf.Has("mytype") << " " << conf.Get("mytype") << endl; - - cout << "---" << endl; - cout << conf.Has("test:A") << " " << conf.Get("test:A") << endl; - cout << conf.Has("test:%") << " " << conf.Get("test:%") << endl; - cout << conf.Has("test:9") << " " << conf.Get("test:9") << endl; - -/* - map m = conf.GetMap("test:"); - - cout << m["test:A"] << endl; - cout << m["test:%"] << endl; - cout << m["test:9"] << endl; -*/ - + cout << conf.Has("bool") << " " << conf.Get("bool") << endl; return 0; Index: trunk/FACT++/src/logtime.cc =================================================================== --- trunk/FACT++/src/logtime.cc (revision 11982) +++ trunk/FACT++/src/logtime.cc (revision 11983) @@ -6,9 +6,7 @@ #include -#include "DimDescriptionService.h" - int main(int, const char **) { - // We could use putenv to make the Configure class change the value... + // We could use putenv to make the Configure class change the value... setenv("DIM_DNS_NODE", "localhost", 0); @@ -16,32 +14,6 @@ DimServer::start("TIME"); - usleep(2000000); - - DimServer::stop(); - - return 0; - // Some info on the console std::cout << "Offering TIME/MESSAGE...\n" << std::endl; - - short s; - int i; - long long ll; - float f; - DimDescribedService servt("TIME/TEST", "O:1;I:1;C", - "This is my test command|Char[c]:This is a char| Int This is an int|String[s]:This is a string"); - - DimDescribedService servs("TIME/SHORT", s, "[a]"); - DimDescribedService servx("TIME/LONGLONG", ll, "|: This is my long long"); - DimDescribedService servi("TIME/INT", i, "|MyInt [ mi ] "); - DimDescribedService servf("TIME/FLOAT", f, "| MyFloat : This is my float"); - DimDescribedService servc("TIME/TIME", const_cast(""), "|MyTime[T]:This is my time"); - - DimCommand cmd("TIME/CMD", "I:2;F:2"); - - DimDescriptionService des("TIME/CMD", "|range[addr]:From DAC to DAC|values[DAC]:DAC values to be set"); - - { - Time t0; // Setup a DimService called TIME/MESSAGE @@ -51,21 +23,8 @@ // Send current time msg.Message(Time().GetAsStr()); -// servx.Update(); - /* - servs.updateService(); - servi.updateService(); - servf.updateService(); - servc.updateService(); - */ + // wait approximately one second - usleep(100000); - -// if (t0.UnixTime()-Time().UnixTime()<-5) -// break; + usleep(1000000); } - } - - DimDescribedService servxx("TIME/XXX", const_cast(""), "|MyTime[T]:This is my time"); - usleep(10000000); return 0; Index: trunk/FACT++/src/mcp.cc =================================================================== --- trunk/FACT++/src/mcp.cc (revision 11982) +++ trunk/FACT++/src/mcp.cc (revision 11983) @@ -55,5 +55,4 @@ kStateConfiguring2, kStateConfiguring3, - kStateConfiguring4, kStateConfigured, }; @@ -272,6 +271,4 @@ } - Time fConfigTimer; - int Execute() { @@ -320,17 +317,4 @@ return GetCurrentState(); - fConfigTimer = Time(); - - return kStateConfiguring4; - } - - if (GetCurrentState()==kStateConfiguring4) - { - // We need some delay to ensure that after sending the - // "Enable Trigger Line" command to all FADs the really - // have all already enabled the trigger line - if (Time()-fConfigTimer