looking at snapshotting, change roc idleframe

Author: tomeichlersmith

app/tool/econ_snapshot.cxx

@@ -16,8 +16,6 @@ uint32_t build_channel_mask(std::vector<int>& channels) {
 }
 
 void econ_snapshot(Target* tgt, pflib::ECON& econ, std::vector<int>& channels) {
-  uint32_t binary_channels =
-      build_channel_mask(channels);  // defined in align_phase_word.cxx
   std::cout << "Channels to be configured: ";
   for (int ch : channels) std::cout << ch << " ";
   std::cout << std::endl;
@@ -28,20 +26,15 @@ void econ_snapshot(Target* tgt, pflib::ECON& econ, std::vector<int>& channels) {
   // FAST CONTROL - ENABLE THE BCR (ORBIT SYNC)
   tgt->fc().standard_setup();
 
-  // ------- Scan when the ECON takes snapshot -----
-  int snapshot_val = 3531;  // near your orbit region of interest
-
   // ---- SETTING ECON REGISTERS ---- //
   parameters["ALIGNER"]["GLOBAL_I2C_SNAPSHOT_EN"] = 0;
   parameters["ALIGNER"]["GLOBAL_SNAPSHOT_ARM"] = 0;
   parameters["ALIGNER"]["GLOBAL_SNAPSHOT_EN"] = 1;
-  parameters["ALIGNER"]["GLOBAL_ORBSYN_CNT_SNAPSHOT"] = snapshot_val;
   auto econ_word_align_currentvals = econ.applyParameters(parameters);
 
   // FAST CONTROL - LINK_RESET
   tgt->fc().linkreset_rocs();
 
-  std::cout << "Outputting snapshot at BX " << snapshot_val << std::endl;
   for (int channel : channels) {
     // print out snapshot
 
@@ -66,7 +59,7 @@ void econ_snapshot(Target* tgt, pflib::ECON& econ, std::vector<int>& channels) {
     // shift by 1
     boost::multiprecision::uint256_t shifted1 = (snapshot >> 1);
 
-    std::cout << "Snapshot Printout: " << snapshot_val << std::endl
+    std::cout << "Snapshot Printout: "
               << " (channel " << channel << ") " << std::endl
               << "snapshot_hex_shifted: 0x" << std::hex << std::uppercase
               << shifted1 << std::dec << std::endl;

app/tool/tasks/align_phase_word.cxx

@@ -11,7 +11,12 @@ ENABLE_LOGGING();
 bool debug_checks = false;
 
 // ROC Idle Frame
-constexpr uint32_t ROC_IDLE_FRAME = 0x5555555;
+constexpr uint32_t ROC_IDLE_FRAME = 0x12c5c57;
+
+constexpr uint64_t ECON_ROC_ALIGN_PATTERN = (
+  (0x9ull << 60) | (static_cast<uint64_t>(ROC_IDLE_FRAME) << 32) |
+  (0xaull << 28) | ROC_IDLE_FRAME
+);
 
 // ECON PUSM State READY
 constexpr int ECON_EXPECTED_PUSM_STATE = 8;
@@ -79,6 +84,8 @@ void align_word(Target* tgt, pflib::ROC& roc, pflib::ECON& econ,
   // print ROC status
   if (debug_checks) {
     print_roc_status(roc);
+    std::cout << "ROC_IDLE_FRAME: 0x" << std::hex << ROC_IDLE_FRAME << std::endl;
+    std::cout << "ECON_ROC_ALIGN_PATTERN: 0x" << std::hex << ECON_ROC_ALIGN_PATTERN << std::endl;
   }
 
   // ---- SETTING ECON REGISTERS ---- //
@@ -108,7 +115,7 @@ void align_word(Target* tgt, pflib::ROC& roc, pflib::ECON& econ,
   auto econ_word_align_currentvals_check = econ.applyParameters(parameters);
 
   // Set GLOBAL_MATCH_PATTERN_VAL
-  econ.setValue(0x0381, 0x95555555A5555555, 8);
+  econ.setValue(0x0381, ECON_ROC_ALIGN_PATTERN, 8);
 
   // Verify that channels are still locked
   for (int ch : channels) {
@@ -307,15 +314,13 @@ void align_phase_word(Target* tgt) {
   channels.push_back(mapping[iroc].first);
   channels.push_back(mapping[iroc].second);
 
-  uint32_t binary_channels = build_channel_mask(channels);
   std::cout << "Channels to be configured: ";
   for (int ch : channels) std::cout << ch << " ";
   std::cout << std::endl;
 
   // Check PUSM state
   auto pusm_state = econ.readParameter("CLOCKSANDRESETS", "GLOBAL_PUSM_STATE");
   if (debug_checks) {
-    std::cout << "Decimal value of channels: " << binary_channels << std::endl;
     std::cout << "PUSM_STATE = " << pusm_state << ", " << hex(pusm_state)
               << std::endl;
     reset_stream();