- update

Mu2e · Oct 14, 2024 · b6010a5 · b6010a5
1 parent b6b1333
commit b6010a5
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 27 deletions.
diff --git a/config/pasha/mu2edaq09_pcie0.C b/config/pasha/mu2edaq09_pcie0.C
@@ -13,10 +13,11 @@ int init_run_configuration(DtcGui* X) {
 
   X->fNDtcs           = 1; // 2;              // installed on a machine
 
-  dtc[0].fName        = "CFO";
+  dtc[0].fName        = "DTC" ; // "CFO";
   dtc[0].fPcieAddr    = 0;
-  dtc[0].fLinkMask    = 0x2;            // start from 2 DTCs on link0
-  gSystem->Setenv("CFOLIB_CFO","0");
+  dtc[0].fLinkMask    = 0x1;            // start from 2 DTCs on link0
+  //gSystem->Setenv("CFOLIB_CFO","0");
+  gSystem->Setenv("DTCLIB_DTC","0");
 
   // dtc[0].fName        = "DTC";
   // dtc[0].fPcieAddr    = 1;

diff --git a/config/pasha/mu2edaq09_pcie1.C b/config/pasha/mu2edaq09_pcie1.C
@@ -20,8 +20,8 @@ int init_run_configuration(DtcGui* X) {
 
   dtc[0].fName        = "DTC";
   dtc[0].fPcieAddr    = 1;
-  // dtc[0].fLinkMask    = 0x111;  
-  dtc[0].fLinkMask    = 0x00111111;          // ROC6: link1 stopped responding
+  dtc[0].fLinkMask    = 0x111;  
+  // dtc[0].fLinkMask    = 0x00111111;          // ROC6: link1 stopped responding
   dtc[0].fReadoutMode = 1;               // 0:patterns 1:digis
   gSystem->Setenv("DTCLIB_DTC","1");
 

diff --git a/doc/control_roc.org b/doc/control_roc.org
@@ -1,4 +1,4 @@
-#startup:fold
+#+startup:fold -*- buffer-read-only:t -*- 
 * ------------------------------------------------------------------------------
 * source code: https://github.com/bonventre/trackerScripts/blob/master/control_ROC.py
 * local repo : file:~mu2etrk/products/trackerScripts
@@ -252,20 +252,20 @@ set_digi_rw -s 0
 
 * TODO command implementation over the fiber                                 
 
-| command            | status | comments                                           |
-|--------------------+--------+----------------------------------------------------|
-| digi_rw            |        |                                                    |
-|--------------------+--------+----------------------------------------------------|
-| readSPI            | OK     | implemented                                        |
-| find_alignment     |        | implemented readout, parsing yet to be implemented |
-| set_preamp_thresh  |        |                                                    |
-| measure_thresholds |        |                                                    |
-| pulser_on          |        |                                                    |
-| readDeviceID       |        |                                                    |
-| set_digi_rw        |        | shouldn't need, all goes over the fiber            |
-| rates              |        |                                                    |
-| read               |        |                                                    |
-|--------------------+--------+----------------------------------------------------|
+| command            | status | comments                                |
+|--------------------+--------+-----------------------------------------|
+| digi_rw            |        |                                         |
+|--------------------+--------+-----------------------------------------|
+| readSPI            | OK     | implemented                             |
+| find_alignment     |        | implemented by Ed, minor wrinkle        |
+| set_preamp_thresh  |        |                                         |
+| measure_thresholds |        | ok                                      |
+| pulser_on          |        |                                         |
+| readDeviceID       |        |                                         |
+| set_digi_rw        |        | shouldn't need, all goes over the fiber |
+| rates              |        |                                         |
+| read               |        |                                         |
+|--------------------+--------+-----------------------------------------|
 * ------------------------------------------------------------------------------
 * setting the pulser frequency (Richie)                                      
 -  60 kHz: digi_rw -h 0 -a 85 -d 1 -w 1   # 31.29 MHz / (2**9+1) = 60.9941520468 kHz)
@@ -282,7 +282,7 @@ Ctrl-C
 #+end_src 
   exiting at this point is important, otherwise the serial port will not work properly
 
-** 2) run diagnostics, use whatever USB port the TS1 is on                 
+** 2) to load thresholds, run diagnostics.py, use the USB port the TS1 is on                 
    example of [[file:settings_pasha.dat]]                          
    - all gains  - at 370
    - thresholds - around 400

diff --git a/doc/otsdaq_mu2e_tracker.org b/doc/otsdaq_mu2e_tracker.org
@@ -468,9 +468,11 @@ readDeviceID
 ('DRAC ROC ID #', '7a7fb')
 ** [[file:roc_id_1b561.org][ROC ID 1b561]] : <2024-05-09 Thu> installed at TS1               
 ** [[file:roc_id_805d6.org][ROC ID 805d6]] : <2024-02-25 Sun> installed at TS2
-* test stands TS0, TS1, TS2                                                  
-** last update <2024-07-15 Mon>
-** powering up the test stands (Vadim):                                      
+* test stands TS0, TS1, TS2                     
+- located in G291
+| TS2 | TS0 | TS1 |
+** last update  <2024-09-26 Thu> 
+** powering up the test stands (Vadim):
   https://docs.google.com/document/d/1theA9NIRA5XeUUPVuFGVhU7NddPljgaGznR9aMu-Fv8/edit?usp=sharing
 #+begin_src                           
 mu2e@trackerpi5:~/trackerScripts$ power --list

diff --git a/otsdaq-mu2e-tracker/Gui/DtcGui.hh b/otsdaq-mu2e-tracker/Gui/DtcGui.hh
@@ -243,7 +243,9 @@ public:
   DtcData_t*          fActiveDtc;
 
   int                 fNRocs;
-
+//-----------------------------------------------------------------------------
+// fields set from GUI
+//-----------------------------------------------------------------------------
   TGNumberEntry*      fNEvents;         // DTC , CFO emulation
   TGNumberEntry*      fEWLength;        // DTC , CFO emulation
   TGNumberEntry*      fFirstTS;         // DTC , CFO emulation
@@ -338,6 +340,7 @@ public:
   void     read_subevents     ();
   void     reset_roc          ();
 
+  void     set_ew_length       ();
   void     set_nevents         ();
   void     set_emulate_cfo     ();
   void     set_roc_readout_mode();

diff --git a/otsdaq-mu2e-tracker/Gui/DtcGui_commands.cc b/otsdaq-mu2e-tracker/Gui/DtcGui_commands.cc
@@ -517,6 +517,32 @@ void DtcGui::set_nevents() {
   cout.rdbuf( oldCoutStreamBuf );
 }
 
+//-----------------------------------------------------------------------------
+void DtcGui::set_ew_length() {
+  //  TString cmd;
+
+  DtcTabElement_t* dtel = fDtcTel+fActiveDtcID;
+  int roc               = dtel->fActiveRocID;
+
+  streambuf*    oldCoutStreamBuf = cout.rdbuf();
+  ostringstream strCout;
+  cout.rdbuf(strCout.rdbuf());
+
+  TDatime x1; *fTextView << x1.AsSQLString() << Form(" %s: DTC ID: %i roc: %i\n",__func__,fActiveDtcID,roc);
+//-----------------------------------------------------------------------------
+// CFO doesn't have ROC's
+//-----------------------------------------------------------------------------
+  int ew_length = 0;
+  try         {
+    ew_length = fEWLength->GetIntNumber();
+  }
+  catch (...) { *fTextView << Form("ERROR : coudn't read EW Length ... BAIL OUT",roc) << std::endl; }
+
+  TDatime x2; *fTextView << x2.AsSQLString() << strCout.str() << Form(" %s DONE ew_length = %10i\n",__func__,ew_length);
+  fTextView->ShowBottom();
+  cout.rdbuf( oldCoutStreamBuf );
+}
+
 //-----------------------------------------------------------------------------
 void DtcGui::set_emulate_cfo() {
   //  TString cmd;

diff --git a/otsdaq-mu2e-tracker/Gui/DtcGui_gui.cc b/otsdaq-mu2e-tracker/Gui/DtcGui_gui.cc
@@ -257,8 +257,8 @@ void DtcGui::BuildGui(const TGWindow *Parent, UInt_t Width, UInt_t Height) {
                                 TGNumberFormat::kNEANonNegative,
                                 TGNumberFormat::kNELLimitMinMax,
                                 0, 100000);
-  fEWLength->Connect("ValueSet(Long_t)", "MyMainFrame", this, "DoSetlabel()");
-  (fEWLength->GetNumberEntry())->Connect("ReturnPressed()","MyMainFrame", this,"DoSetlabel()");
+  fEWLength->Connect("ValueSet(Long_t)", "MyMainFrame", this, "set_ew_length()");
+  (fEWLength->GetNumberEntry())->Connect("ReturnPressed()","MyMainFrame", this,"set_ew_length()");
 
   fButtonsFrame->AddFrame(fEWLength, new TGLayoutHints(kLHintsLeft | kLHintsTop,2,2,2,2));
 //-----------------------------------------------------------------------------