Changeset 11983 for trunk


Ignore:
Timestamp:
09/06/11 12:54:57 (13 years ago)
Author:
tbretz
Message:
Reverted unintentional last commit.
Location:
trunk/FACT++
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.am

    r11982 r11983  
    3838        chatclient chatserv \
    3939        biasctrl \
    40         mcp feedback \
     40        mcp \
    4141        fitsdump
    4242
    … …  
    269269        libConfiguration.la
    270270
    271 feedback_SOURCES = src/feedback.cc src/LocalControl.h
    272 feedback_LDADD   = libDim.la libDim++.la  libDimExtension.la \
    273                 libTime.la libTools.la libStateMachine.la \
    274                 libConfiguration.la
    275 
    276271
    277272argv_SOURCES = src/argv.cc

  • trunk/FACT++/Makefile.in

    r11982 r11983  
    5252        fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) fsc$(EXEEXT) \
    5353        chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
    54         mcp$(EXEEXT) feedback$(EXEEXT) fitsdump$(EXEEXT) \
    55         $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
    56         $(am__EXEEXT_4)
     54        mcp$(EXEEXT) fitsdump$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
     55        $(am__EXEEXT_3) $(am__EXEEXT_4)
    5756@HAS_GUI_TRUE@am__append_1 = fact
    5857@HAS_VIEWER_TRUE@am__append_2 = viewer
    … …  
    271270fadctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
    272271        libTime.la libTools.la libStateMachine.la libConfiguration.la
    273 am_feedback_OBJECTS = src/feedback.$(OBJEXT)
    274 feedback_OBJECTS = $(am_feedback_OBJECTS)
    275 feedback_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
    276         libTime.la libTools.la libStateMachine.la libConfiguration.la
    277272am_fitsdump_OBJECTS = src/fitsdump.$(OBJEXT)
    278273fitsdump_OBJECTS = $(am_fitsdump_OBJECTS)
    … …  
    398393        $(dimctrl_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
    399394        $(dserver2_SOURCES) $(fact_SOURCES) $(fad_SOURCES) \
    400         $(fadctrl_SOURCES) $(feedback_SOURCES) $(fitsdump_SOURCES) \
    401         fitsgrep.c $(fitsloader_SOURCES) $(fsc_SOURCES) \
    402         $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
    403         $(log_SOURCES) $(logtime_SOURCES) $(mcp_SOURCES) \
    404         $(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
    405         $(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES) \
    406         $(viewer_SOURCES)
     395        $(fadctrl_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
     396        $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
     397        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
     398        $(logtime_SOURCES) $(mcp_SOURCES) $(readfits_SOURCES) sched.c \
     399        $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
     400        $(triggerschedule_SOURCES) $(viewer_SOURCES)
    407401DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
    408402        $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
    … …  
    414408        $(drivectrl_SOURCES) $(dserver2_SOURCES) \
    415409        $(am__fact_SOURCES_DIST) $(fad_SOURCES) \
    416         $(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \
    417         $(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
    418         $(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
    419         $(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
    420         $(mcp_SOURCES) $(readfits_SOURCES) sched.c \
     410        $(am__fadctrl_SOURCES_DIST) $(fitsdump_SOURCES) fitsgrep.c \
     411        $(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
     412        $(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
     413        $(logtime_SOURCES) $(mcp_SOURCES) $(readfits_SOURCES) sched.c \
    421414        $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
    422415        $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST)
    … …  
    859852        libConfiguration.la
    860853
    861 feedback_SOURCES = src/feedback.cc src/LocalControl.h
    862 feedback_LDADD = libDim.la libDim++.la  libDimExtension.la \
    863                 libTime.la libTools.la libStateMachine.la \
    864                 libConfiguration.la
    865 
    866854argv_SOURCES = src/argv.cc
    867855argv_LDADD = libConfiguration.la
    … …  
    13031291        @rm -f fadctrl$(EXEEXT)
    13041292        $(AM_V_CXXLD)$(CXXLINK) $(fadctrl_OBJECTS) $(fadctrl_LDADD) $(LIBS)
    1305 src/feedback.$(OBJEXT): src/$(am__dirstamp) \
    1306         src/$(DEPDIR)/$(am__dirstamp)
    1307 feedback$(EXEEXT): $(feedback_OBJECTS) $(feedback_DEPENDENCIES)
    1308         @rm -f feedback$(EXEEXT)
    1309         $(AM_V_CXXLD)$(CXXLINK) $(feedback_OBJECTS) $(feedback_LDADD) $(LIBS)
    13101293src/fitsdump.$(OBJEXT): src/$(am__dirstamp) \
    13111294        src/$(DEPDIR)/$(am__dirstamp)
    … …  
    15291512        -rm -f src/fad.$(OBJEXT)
    15301513        -rm -f src/fadctrl.$(OBJEXT)
    1531         -rm -f src/feedback.$(OBJEXT)
    15321514        -rm -f src/fitsdump.$(OBJEXT)
    15331515        -rm -f src/fitsloader.$(OBJEXT)
    … …  
    16391621@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fad.Po@am__quote@
    16401622@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fadctrl.Po@am__quote@
    1641 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/feedback.Po@am__quote@
    16421623@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsdump.Po@am__quote@
    16431624@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsloader.Po@am__quote@

  • trunk/FACT++/ftmctrl.rc

    r11982 r11983  
    1 console=2
    2 
    3 run-type=data
    4 run-type=pedestal
    5 run-type=drs-calib
    6 
    7 sampling-frequency.default = 2000
    8 
    9 ftu-report-interval.default = 100
    10 
    11 
    12 [trigger]
    13 enable-trigger.default = yes
    14 enable-trigger.pedestal = no
    15 enable-trigger.drs-calib = no
    16 
    17 enable-external-1.default = no
    18 enable-external-2.default = no
    19 enable-veto.default = no
    20 enable-clock-conditioner.default = no
    21 
    22 multiplicity-physics.default = 1
    23 multiplicity-calib.default = 40
    24 coincidence-window-physics.default = 10
    25 coincidence-window-calib.default = 10
    26 dead-time.default = 25
    27 delay.default = 25
    28 time-marker-delay.default = 25
    29 
    30 #disable-patch.default =
    31 #disable-pixel.default =
    32 
    33 
    34 [trigger.threshold]
    35 
    36 patch.default = 150
    37 logic.default = 16
    38 
    39 
    40 [trigger.sequence]
    41 interval.default = 50
    42 pedestal.default = 0
    43 lp-int.default = 0
    44 lp-ext.default = 0
    45 
    46 
    47 [light-pulser.external]
    48 
    49 intensity.default = 100
    50 enable-group1.default = no
    51 enable-group2.default = no
    52 
    53 
    54 [light-pulser.internal]
    55 
    56 intensity.default =  10
    57 enable-group1.default = no
    58 enable-group2.default = no
    59 
    60 
    611[clock-conditioner]
    622frequency   = 800
    … …  
    9636R15.4000    = 0x1400fa0f
    9737R15.5000    = 0x0802710f
    98 

  • trunk/FACT++/src/RemoteControl.h

    r11982 r11983  
    121121    {
    122122    }
    123 
    124     //void SetReceiver(void *) { }
    125123
    126124    bool PrintGeneralHelp()

  • trunk/FACT++/src/argv.cc

    r11982 r11983  
    44
    55using namespace std;
    6 
    7 template<class T,class S>
    8 std::ostream &operator<<(std::ostream &out, const pair<T,S> &f)
    9 {
    10     out << f.first << "|" << f.second;
    11     return out;
    12 }
    13 template<class T, class S>
    14 std::istream &operator>>(std::istream &in,  pair<T,S> &f)
    15 {
    16     char c;
    17     in >> f.first;
    18     in >> c;
    19     if (c!=':')
    20         return in;
    21     in >> f.second;
    22     return in;
    23 }
    24 
    25 typedef pair<int,int> mytype;
    26 
    27 
    28 //Source is OutputStreamable, meaning that an operator<< is defined
    29 // that takes a std::ostream or std::wostream object on the left hand side
    30 // and an instance of the argument type on the right.
    31 
    32 // Target is InputStreamable, meaning that an operator>> is defined that
    33 // takes a std::istream or std::wistream object on the left hand side and
    34 // an instance of the result type on the right.
    35 
    36 //Target is CopyConstructible [20.1.3].
    37 //Target is DefaultConstructible, meaning that it is possible to default-initialize an object of that type [8.5, 20.1.4].
    386
    397// --------------------------------------------------------------------------
    … …  
    9967    po::options_description config("Configuration");
    10068    config.add_options()
    101         ("xxx", vars<int>(),             "Print available commandline options.")
    102         ("test.*", var<int>(),             "Print available commandline options.")
    103         ("map.*",  var<int>(),             "Print available commandline options.")
    10469        ("compression",    var<int>(),                      "set compression level")
    10570        ("optimization",   var<int>(10, &opt),              "optimization level")
    … …  
    11782        ("switch",        po_switch(),                    "include path")
    11883        ("bool",          var<bool>()->implicit_value(true),                    "include path")
    119         ("mytype",        var<mytype>(),                  "include path")
    12084        ;
    12185
    … …  
    206170    cout << "Program " << argv[0] << " started successfully." << endl;
    207171
    208     cout << conf.Has("test.A") << " " << conf.Get<int>("test.A") << endl;
    209     cout << conf.Has("test.%") << " " << conf.Get<int>("test.%") << endl;
    210     cout << conf.Has("test.9") << " " << conf.Get<int>("test.9") << endl;
    211     cout << conf.Has("test.data") << " " << conf.Get<int>("test.data") << endl;
    212     cout << conf.Has("test.pedestal") << " " << conf.Get<int>("test.pedestal") << endl;
    213     cout << conf.Has("map.1") << " " << conf.Get<int>("map.1") << endl;
    214     cout << conf.Has("map.2") << " " << conf.Get<int>("map.2") << endl;
    215 
    216     return 0;
    217 
    218172    cout << conf.Has("switch") << " " << conf.Get<bool>("switch") << endl;
    219     cout << conf.Has("bool")   << " " << conf.Get<bool>("bool") << endl;
    220     cout << conf.Has("mytype") << " " << conf.Get<mytype>("mytype") << endl;
    221 
    222     cout << "---" << endl;
    223     cout << conf.Has("test:A") << " " << conf.Get<int>("test:A") << endl;
    224     cout << conf.Has("test:%") << " " << conf.Get<int>("test:%") << endl;
    225     cout << conf.Has("test:9") << " " << conf.Get<int>("test:9") << endl;
    226 
    227 /*
    228     map<string, int> m = conf.GetMap<int>("test:");
    229 
    230     cout << m["test:A"] << endl;
    231     cout << m["test:%"] << endl;
    232     cout << m["test:9"] << endl;
    233 */
    234 
     173    cout << conf.Has("bool") << " " << conf.Get<bool>("bool") << endl;
    235174
    236175    return 0;

  • trunk/FACT++/src/logtime.cc

    r11982 r11983  
    66#include <iostream>
    77
    8 #include "DimDescriptionService.h"
    9 
    108int main(int, const char **)
    119{
    12     // We could use putenv to make the Configure class change the value...
     10   // We could use putenv to make the Configure class change the value...
    1311    setenv("DIM_DNS_NODE", "localhost", 0);
    1412
    … …  
    1614    DimServer::start("TIME");
    1715
    18     usleep(2000000);
    19 
    20     DimServer::stop();
    21 
    22     return 0;
    23 
    2416    // Some info on the console
    2517    std::cout << "Offering TIME/MESSAGE...\n" << std::endl;
    26 
    27     short s;
    28     int i;
    29     long long ll;
    30     float f;
    31     DimDescribedService servt("TIME/TEST", "O:1;I:1;C",
    32                               "This is my test command|Char[c]:This is a char|   Int This is an int|String[s]:This is a string");
    33 
    34     DimDescribedService servs("TIME/SHORT",     s,  "[a]");
    35     DimDescribedService servx("TIME/LONGLONG",  ll, "|: This is my long long");
    36     DimDescribedService servi("TIME/INT",       i,  "|MyInt  [  mi  ] ");
    37     DimDescribedService servf("TIME/FLOAT",     f,  "|   MyFloat  :   This is my float");
    38     DimDescribedService servc("TIME/TIME", const_cast<char*>(""), "|MyTime[T]:This is my time");
    39 
    40     DimCommand cmd("TIME/CMD", "I:2;F:2");
    41 
    42     DimDescriptionService des("TIME/CMD", "|range[addr]:From DAC to DAC|values[DAC]:DAC values to be set");
    43 
    44     {
    45     Time t0;
    4618
    4719    // Setup a DimService called TIME/MESSAGE
    … …  
    5123        // Send current time
    5224        msg.Message(Time().GetAsStr());
    53 //        servx.Update();
    54         /*
    55         servs.updateService();
    56         servi.updateService();
    57         servf.updateService();
    58         servc.updateService();
    59          */
     25
    6026        // wait approximately one second
    61         usleep(100000);
    62 
    63 //        if (t0.UnixTime()-Time().UnixTime()<-5)
    64 //            break;
     27        usleep(1000000);
    6528    }
    66     }
    67 
    68     DimDescribedService servxx("TIME/XXX", const_cast<char*>(""), "|MyTime[T]:This is my time");
    69     usleep(10000000);
    7029
    7130    return 0;

  • trunk/FACT++/src/mcp.cc

    r11982 r11983  
    5555        kStateConfiguring2,
    5656        kStateConfiguring3,
    57         kStateConfiguring4,
    5857        kStateConfigured,
    5958    };
    … …  
    272271    }
    273272
    274     Time fConfigTimer;
    275 
    276273    int Execute()
    277274    {
    … …  
    320317                    return GetCurrentState();
    321318
    322                 fConfigTimer = Time();
    323 
    324                 return kStateConfiguring4;
    325             }
    326 
    327             if (GetCurrentState()==kStateConfiguring4)
    328             {
    329                 // We need some delay to ensure that after sending the
    330                 // "Enable Trigger Line" command to all FADs the really
    331                 // have all already enabled the trigger line
    332                 if (Time()-fConfigTimer<boost::posix_time::milliseconds(100))
    333                     return kStateConfiguring4;
    334 
    335319                Message("Starting Trigger (FTM)");
    336320                Dim::SendCommand("FTM_CONTROL/START_RUN");
    … …  
    407391
    408392        AddStateName(kStateConfiguring3, "Configuring3",
    409                      ".");
    410 
    411         AddStateName(kStateConfiguring4, "Configuring4",
    412393                     ".");
    413394
Note: See TracChangeset for help on using the changeset viewer.