Changeset 11251


Ignore:
Timestamp:
Jul 4, 2011, 10:21:29 PM (9 years ago)
Author:
tbretz
Message:
Started to unify the main program of the io_service based control program.
Location:
trunk/FACT++/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/datalogger.cc

    r11245 r11251  
    10471047    delete fOpenedRunFiles;
    10481048    delete fNumSubAndFits;
     1049    delete fStatsMonitoring;
    10491050
    10501051    if (fDebugIsOn)
     
    25132514*/
    25142515// --------------------------------------------------------------------------
     2516
     2517#include "Main.h"
     2518/*
    25152519void RunThread(DataLogger* logger)
    25162520{
     
    25202524    Readline::Stop();   
    25212525}
     2526*/
    25222527// --------------------------------------------------------------------------
    25232528template<class T>
    25242529int RunShell(Configuration &conf)
    25252530{
     2531    return Main<T, DataLogger>(conf, true);
     2532/*
    25262533    static T shell(conf.GetName().c_str(), conf.Get<int>("console")!=1);
    25272534
     
    25702577
    25712578    return 0;
     2579*/
    25722580}
    25732581
  • trunk/FACT++/src/drivectrl.cc

    r11221 r11251  
    859859// ------------------------------------------------------------------------
    860860
     861#include "Main.h"
     862
     863/*
    861864void RunThread(StateMachineImp *io_service)
    862865{
     
    866869    Readline::Stop();
    867870}
    868 
     871*/
    869872/*
    870873template<class S, class T>
     
    894897int RunShell(Configuration &conf)
    895898{
     899    return Main<T, StateMachineDrive<S, R>>(conf);
     900/*
    896901    static T shell(conf.GetName().c_str(), conf.Get<int>("console")!=1);
    897902
     
    939944
    940945    return 0;
     946    */
    941947}
    942948
  • trunk/FACT++/src/fadctrl.cc

    r11243 r11251  
    16821682// ------------------------------------------------------------------------
    16831683
    1684 
     1684#include "Main.h"
     1685
     1686/*
    16851687void RunThread(StateMachineImp *io_service)
    16861688{
     
    16901692    Readline::Stop();
    16911693}
    1692 
     1694*/
    16931695/*
    16941696template<class S>
     
    17181720int RunShell(Configuration &conf)
    17191721{
     1722    return Main<T, StateMachineFAD<S>>(conf);
     1723/*
    17201724    static T shell(conf.GetName().c_str(), conf.Get<int>("console")!=1);
    17211725
     
    17621766
    17631767    return 0;
     1768    */
    17641769}
    17651770
  • trunk/FACT++/src/fscctrl.cc

    r11218 r11251  
    530530// ------------------------------------------------------------------------
    531531
     532#include "Main.h"
     533
     534/*
    532535void RunThread(StateMachineImp *io_service)
    533536{
     
    537540    Readline::Stop();
    538541}
    539 
     542*/
    540543/*
    541544template<class S, class T>
     
    566569int RunShell(Configuration &conf)
    567570{
     571    return Main<T, StateMachineFSC<S, R>>(conf);
     572/*
    568573    static T shell(conf.GetName().c_str(), conf.Get<int>("console")!=1);
    569574
     
    611616
    612617    return 0;
     618*/
    613619}
    614620
  • trunk/FACT++/src/ftmctrl.cc

    r11221 r11251  
    18441844// ------------------------------------------------------------------------
    18451845
     1846#include "Main.h"
     1847
     1848/*
    18461849void RunThread(StateMachineImp *io_service)
    18471850{
     
    18511854    Readline::Stop();
    18521855}
    1853 
     1856*/
    18541857/*
    18551858template<class S, class T>
     
    18791882int RunShell(Configuration &conf)
    18801883{
     1884    return Main<T, StateMachineFTM<S, R>>(conf);
     1885/*
    18811886    static T shell(conf.GetName().c_str(), conf.Get<int>("console")!=1);
    18821887
     
    19241929
    19251930    return 0;
     1931    */
    19261932}
    19271933
  • trunk/FACT++/src/scheduler.cc

    r11221 r11251  
    729729
    730730// ------------------------------------------------------------------------
    731 
     731#include "Main.h"
     732/*
    732733void RunThread(StateMachineImp *io_service)
    733734{
     
    737738    Readline::Stop();
    738739}
    739 
     740*/
    740741/*
    741742template<class S>
     
    766767int RunShell(Configuration &conf)
    767768{
     769    return Main<T, AutoScheduler<S>>(conf);
     770    /*
    768771    static T shell(conf.GetName().c_str(), conf.Get<int>("console")!=1);
    769772
     
    812815
    813816    return 0;
     817*/
    814818}
    815819
Note: See TracChangeset for help on using the changeset viewer.