Changeset 18283
- Timestamp:
- 08/20/15 09:03:54 (9 years ago)
- Location:
- trunk/FACT++/scripts
- Files:
-
- 1 added
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/scripts/Main.js
r18217 r18283 109 109 continue; 110 110 111 if (irq || !takeRun("drs-pedestal", 1000)) // 40 / 20s (50Hz) 112 continue; 111 if (where!="data") 112 { 113 if (irq || !takeRun("drs-pedestal", 1000)) // 40 / 20s (50Hz) 114 continue; 115 } 113 116 114 117 break; 115 118 } 116 119 117 dim.send("FAD_CONTROL/SET_FILE_FORMAT", 6); 118 119 while (!irq && !takeRun("drs-pedestal", 1000)); // 40 / 20s (50Hz) 120 while (!irq && !takeRun("drs-time", 1000)); // 40 / 20s (50Hz) 120 if (where!="data") 121 { 122 dim.send("FAD_CONTROL/SET_FILE_FORMAT", 6); 123 124 while (!irq && !takeRun("drs-pedestal", 1000)); // 40 / 20s (50Hz) 125 while (!irq && !takeRun("drs-time", 1000)); // 40 / 20s (50Hz) 126 } 121 127 122 128 while (!irq) … … 1158 1164 if (!irq) 1159 1165 { 1166 dim.log("Starting calibration."); 1167 1168 // Calibration (2% of 20') 1169 while (!irq) 1170 { 1171 if (irq || !takeRun("pedestal", 1000)) // 80 Hz -> 10s 1172 continue; 1173 if (irq || !takeRun("light-pulser-ext", 1000)) // 80 Hz -> 10s 1174 continue; 1175 break; 1176 } 1177 1160 1178 var tm2 = new Date(); 1161 1179 … … 1473 1491 if (irq || !takeRun("pedestal", 1000)) // 80 Hz -> 10s 1474 1492 continue; 1475 if (irq || !takeRun("light-pulser-ext", 1000)) // 80 Hz -> 10s1476 continue;1493 // if (irq || !takeRun("light-pulser-ext", 1000)) // 80 Hz -> 10s 1494 // continue; 1477 1495 break; 1478 1496 }
Note:
See TracChangeset
for help on using the changeset viewer.