Index: /trunk/FACT++/src/ftmctrl.cc =================================================================== --- /trunk/FACT++/src/ftmctrl.cc (revision 11343) +++ /trunk/FACT++/src/ftmctrl.cc (revision 11344) @@ -722,6 +722,5 @@ return true; - for (int i=0; i<40; i++) - data[i].fPrescaling = value; + data.SetPrescaling(value); // Maybe move to a "COMMIT" command? @@ -837,10 +836,11 @@ FTM::StaticData data(fStaticData); - data.Enable(FTM::StaticData::kPedestal, d[0]>0); - data.Enable(FTM::StaticData::kLPext, d[1]>0); - data.Enable(FTM::StaticData::kLPint, d[2]>0); - - data.fTriggerSequence = - (uint16_t(d[0])<<10) | (uint16_t(d[2])<<5) | uint16_t(d[1]); + /* + data.Enable(FTM::StaticData::kPedestal, d[0]>0); + data.Enable(FTM::StaticData::kLPext, d[1]>0); + data.Enable(FTM::StaticData::kLPint, d[2]>0); + */ + + data.SetSequence(d[0], d[2], d[1]); //if (fStaticData.fTriggerSeq !=data.fTriggerSequence || @@ -926,10 +926,8 @@ for (int i=0; i<8; i++) - { if (reg[i]>0xffffffff) return false; - data.fClockConditioner[i] = reg[i]; - } + data.SetClockRegister(reg); CmdSendStatDat(data); @@ -1966,4 +1964,25 @@ map> fClockCondSetup; + + template + bool CheckConfigVal(const Configuration &conf, V max, const string &name, const string &sub) + { + if (!conf.HasDef(name, sub)) + { + T::Error("Neither "+name+"default nor "+name+sub+" found."); + return false; + } + + const V val = conf.GetDef(name, sub); + + if (val<=max) + return true; + + ostringstream str; + str << name << sub << "=" << val << " exceeds allowed maximum of " << max << "!"; + T::Error(str); + + return false; + } int EvalConfiguration(const Configuration &conf) @@ -2004,12 +2023,12 @@ boost::array &arr = fClockCondSetup[*it]; - arr[0] = conf.GetDef>("clock-conditioner.R0.", *it); - arr[1] = conf.GetDef>("clock-conditioner.R1.", *it); - arr[2] = conf.GetDef>("clock-conditioner.R8.", *it); - arr[3] = conf.GetDef>("clock-conditioner.R9.", *it); - arr[4] = conf.GetDef>("clock-conditioner.R11.", *it); - arr[5] = conf.GetDef>("clock-conditioner.R13.", *it); - arr[6] = conf.GetDef>("clock-conditioner.R14.", *it); - arr[7] = conf.GetDef>("clock-conditioner.R15.", *it); + arr[0] = conf.GetDef>("clock-conditioner.R0.", *it); + arr[1] = conf.GetDef>("clock-conditioner.R1.", *it); + arr[2] = conf.GetDef>("clock-conditioner.R8.", *it); + arr[3] = conf.GetDef>("clock-conditioner.R9.", *it); + arr[4] = conf.GetDef>("clock-conditioner.R11.", *it); + arr[5] = conf.GetDef>("clock-conditioner.R13.", *it); + arr[6] = conf.GetDef>("clock-conditioner.R14.", *it); + arr[7] = conf.GetDef>("clock-conditioner.R15.", *it); ostringstream out; @@ -2018,4 +2037,127 @@ out << " " << setw(8) << arr[i]; T::Message(out.str()); + } + + // ---------- Setup run types --------- + const vector types = conf.Get>("run-type"); + if (types.size()==0) + T::Warn("No run-types defined."); + + T::Message("Defining run-types"); + for (vector::const_iterator it=types.begin(); + it!=types.end(); it++) + { + if (fConfigs.count(*it)>0) + { + T::Error("Run-type "+*it+" defined twice."); + return 2; + } + + FTM::StaticData data; + + const uint16_t frq = conf.GetDef("sampling-frequency.", *it); + if (fClockCondSetup.count(frq)==0) + { + T::Error("sampling-frequency."+*it+" - frequency not available."); + return 2; + } + + data.SetClockRegister(fClockCondSetup[frq].data()); + + // Trigger sequence ped:lp1:lp2 + // (data. is used here as an abbreviation for FTM::StaticData:: + if (!CheckConfigVal (conf, true, "enable-trigger.", *it) || + !CheckConfigVal (conf, true, "enable-external-1.", *it) || + !CheckConfigVal (conf, true, "enable-external-2.", *it) || + !CheckConfigVal (conf, true, "enable-veto.", *it) || + !CheckConfigVal (conf, true, "enable-clock-conditioner.", *it) || + !CheckConfigVal(conf, data.kMaxSequence, "trigger-sequence-ped.", *it) || + !CheckConfigVal(conf, data.kMaxSequence, "trigger-sequence-lp-ext.", *it) || + !CheckConfigVal(conf, data.kMaxSequence, "trigger-sequence-lp-int.", *it) || + !CheckConfigVal(conf, data.kMaxTriggerInterval, "trigger-interval.", *it) || + !CheckConfigVal(conf, data.kMaxMultiplicity, "multiplicity-physics.", *it) || + !CheckConfigVal(conf, data.kMaxMultiplicity, "multiplicity-calib.", *it) || + !CheckConfigVal(conf, data.kMaxWindow, "coincidence-window-physics.", *it) || + !CheckConfigVal(conf, data.kMaxWindow, "coincidence-window-calib.", *it) || + !CheckConfigVal(conf, data.kMaxDeadTime, "dead-time.", *it) || + !CheckConfigVal(conf, data.kMaxDelayTrigger, "trigger-delay.", *it) || + !CheckConfigVal(conf, data.kMaxDelayTimeMarker, "time-marker-delay.", *it) || + !CheckConfigVal(conf, 0xffff, "ftu-report-interval.", *it) || + 0) + return 2; + + data.Enable(data.kTrigger, conf.GetDef("enable-trigger.", *it)); + data.Enable(data.kExt1, conf.GetDef("enable-external-1.", *it)); + data.Enable(data.kExt2, conf.GetDef("enable-external-2.", *it)); + data.Enable(data.kVeto, conf.GetDef("enable-veto.", *it)); + data.Enable(data.kClockConditioner, conf.GetDef("enable-clock-conditioner.", *it)); + + // [ms] Interval between two artificial triggers (no matter which type) minimum 1ms, 10 bit + data.fTriggerInterval = conf.GetDef("trigger-interval.", *it); + data.fMultiplicityPhysics = conf.GetDef("multiplicity-physics.", *it); + data.fMultiplicityCalib = conf.GetDef("multiplicity-calib.", *it); + data.fWindowPhysics = conf.GetDef("coincidence-window-physics.", *it); /// (4ns * x + 8ns) + data.fWindowCalib = conf.GetDef("coincidence-window-calib.", *it); /// (4ns * x + 8ns) + data.fDelayTrigger = conf.GetDef("trigger-delay.", *it); /// (4ns * x + 8ns) + data.fDelayTimeMarker = conf.GetDef("time-marker-delay.", *it); /// (4ns * x + 8ns) + data.fDeadTime = conf.GetDef("dead-time.", *it); /// (4ns * x + 8ns) + + data.SetPrescaling(conf.GetDef("ftu-report-interval.", *it)); + + const uint16_t seqped = conf.GetDef("trigger-sequence-ped.", *it); + const uint16_t seqint = conf.GetDef("trigger-sequence-lp-int.", *it); + const uint16_t seqext = conf.GetDef("trigger-sequence-lp-ext.", *it); + + data.SetSequence(seqped, seqint, seqext); + + data.EnableAllFTU(); + data.EnableAllPixel(); + + const vector pat1 = conf.Vec("disable-patch.default"); + const vector pat2 = conf.Vec("disable-patch."+*it); + + const vector pix1 = conf.Vec("disable-pixel.default"); + const vector pix2 = conf.Vec("disable-pixel."+*it); + + vector pat, pix; + pat.insert(pat.end(), pat1.begin(), pat1.end()); + pat.insert(pat.end(), pat2.begin(), pat2.end()); + pix.insert(pix.end(), pix1.begin(), pix1.end()); + pix.insert(pix.end(), pix2.begin(), pix2.end()); + + for (vector::const_iterator ip=pat.begin(); ip!=pat.end(); ip++) + { + if (*ip>FTM::StaticData::kMaxPatchIdx) + { + ostringstream str; + str << "disable-patch.*=" << *ip << " exceeds allowed maximum of " << FTM::StaticData::kMaxPatchIdx << "!"; + T::Error(str); + return 2; + } + data.DisableFTU(*ip); + } + for (vector::const_iterator ip=pix.begin(); ip!=pix.end(); ip++) + { + if (*ip>FTM::StaticData::kMaxPixelIdx) + { + ostringstream str; + str << "disable-pixel.*=" << *ip << " exceeds allowed maximum of " << FTM::StaticData::kMaxPixelIdx << "!"; + T::Error(str); + return 2; + } + data.EnablePixel(*ip, false); + } + + fConfigs[*it] = data; + + /* + threshold-A data[n].fDAC[0] = val + threshold-B data[n].fDAC[1] = val + threshold-C data[n].fDAC[2] = val + threshold-D data[n].fDAC[3] = val + threshold-H data[n].fDAC[4] = val + */ + + // kMaxDAC = 0xfff, } @@ -2148,13 +2290,34 @@ po::options_description runtype("Run type configuration"); runtype.add_options() - ("clock-conditioner.frequency", vars(), "Frequencies for which to setup the clock-conditioner") - ("clock-conditioner.R0.*", var>(), "Clock-conditioner R0 (replace * by the defined frequency)") - ("clock-conditioner.R1.*", var>(), "Clock-conditioner R1 (replace * by the defined frequency)") - ("clock-conditioner.R8.*", var>(), "Clock-conditioner R8 (replace * by the defined frequency)") - ("clock-conditioner.R9.*", var>(), "Clock-conditioner R9 (replace * by the defined frequency)") - ("clock-conditioner.R11.*", var>(), "Clock-conditioner R11 (replace * by the defined frequency)") - ("clock-conditioner.R13.*", var>(), "Clock-conditioner R13 (replace * by the defined frequency)") - ("clock-conditioner.R14.*", var>(), "Clock-conditioner R14 (replace * by the defined frequency)") - ("clock-conditioner.R15.*", var>(), "Clock-conditioner R15 (replace * by the defined frequency)") + ("clock-conditioner.frequency", vars(), "Frequencies for which to setup the clock-conditioner") + ("clock-conditioner.R0.*", var>(), "Clock-conditioner R0 (replace * by the defined frequency)") + ("clock-conditioner.R1.*", var>(), "Clock-conditioner R1 (replace * by the defined frequency)") + ("clock-conditioner.R8.*", var>(), "Clock-conditioner R8 (replace * by the defined frequency)") + ("clock-conditioner.R9.*", var>(), "Clock-conditioner R9 (replace * by the defined frequency)") + ("clock-conditioner.R11.*", var>(), "Clock-conditioner R11 (replace * by the defined frequency)") + ("clock-conditioner.R13.*", var>(), "Clock-conditioner R13 (replace * by the defined frequency)") + ("clock-conditioner.R14.*", var>(), "Clock-conditioner R14 (replace * by the defined frequency)") + ("clock-conditioner.R15.*", var>(), "Clock-conditioner R15 (replace * by the defined frequency)") + ("run-type", vars(), "") + ("sampling-frequency.*", var(), "") + ("enable-trigger.*", var(), "") + ("enable-external-1.*", var(), "") + ("enable-external-2.*", var(), "") + ("enable-veto.*", var(), "") + ("enable-clock-conditioner.*", var(), "") + ("trigger-interval.*", var(), "") + ("trigger-sequence-ped.*", var(), "") + ("trigger-sequence-lp-int.*", var(), "") + ("trigger-sequence-lp-ext.*", var(), "") + ("multiplicity-physics.*", var(), "") + ("multiplicity-calib.*", var(), "") + ("coincidence-window-physics.*", var(), "") + ("coincidence-window-calib.*", var(), "") + ("dead-time.*", var(), "") + ("trigger-delay.*", var(), "") + ("time-marker-delay.*", var(), "") + ("diable-pixel.*", vars(), "") + ("diable-patch.*", vars(), "") + ("ftu-report-interval.*", var(), "") ;