VISモデルファイルの更新 次のVISモデルファイルの更新を行いました。 Yamamoto-sanからの要求 Tower: 総データ量が厳しい為、DQチャンネル削減を目的として、TOWER_MASTER/TOWER_MASTERをType毎に分割する。 新たに次の3モデルを作成して置き換えを行う予定でしたがType-Aのみ実施してType-B,Bpは未実施としました。 まず、次のファイルを共通ファイルに作成しました。 本日更新を行なったファイルはETMX,ETMY,ITMX,ITMYのみです。 BS,SR2,SR3,PRM,PR2,PR3は未変更です。 対応できなかった理由は、DAQ Timig error 0x4000,0x5000が多発した為です。 これらは来週再検討します。変更ファイルはk1visXXX_new.mdlにて残しました。 作業中にk1vissr2pの再起動でハングしましたのでDolphonをDisableにして復帰させました。 しかし道連れにk1ioo1とk1srmのDolphin接続が切れたので2台とも再起動しました。 TOWER_MASTER/TYPEA_TOWER_MASTER TOWER_MASTER/TYPEB_TOWER_MASTER TOWER_MASTER/TYPEBP_TOWER_MASTER それぞれTOWER_MASTERからの変更点をは次の通りです。 TOWER_MASTER/TYPEA_TOWER_MASTER SF: 削除 TOWER_MASTER/TYPEB_TOWER_MASTER F2,F3,SF: 削除 BF: MNOLDAMP, PFOLDAMPを削除してType-Bpと共通とした。 V1,V2,V3,H1,H2,H3、LTVRPYの接続はTop階層ではなくTYPEB_TOWER_MASTER内でGND,Terminatorに接続 BIO: PIとGASのみにする。 GASMODAL: F1,F2,BFの3段に修正 SHMEM:   K1:VIS-{optic}P_TM_OPLEV_{L,P,Y}_OUTを削除(K-Log#17368にて追加したがType-Bは不要)   optic: BS, SR2, SR3(BSは共通ファイルでは無いので対象外)  Payload側からも削除 TOWER_MASTER/TYPEBP_TOWER_MASTER IP,F0,F1,F2,F3: 削除 BF: MNOLDAMP, PFOLDAMPを削除した。 GASMODAL: SF,BF(追加)の2段に修正 BIO: PIを削除, GAS, BFH, BFHのみにする Ushiba-sanからの要求 Tower: ACCALIGNをACC2EULとACCBLENDの前へ移動 FLDACC2EULとACCBLENDの間にFLDACCALIGNを追加  K1;VIS-{optic}_IP_FLDACCALIGN  optic: ETMX, ETMY,ITMX,ITMY BS,SR2,SR3は未変更です。  (SRMは共通ファイルではないので未対応) Yamamoto-sanからの要求 Payload: HIRE_SWITCHからHIRESWITCHへ名称変更 Ligoと名称を合わせる目的。 K1:VIS-{optic}_HIERSWITCH optic: ETMX, ETMY, ITMX, ITMY TMへLOCK_OUTSWを追加 K1:VIS-{optic}_TM_LOCK_OUTSWを追加(MNと同様) optic: ETMX, ETMY, ITMX, ITMY, BS, SR2, SR3, PRM, PR2, PR3, MCI, MCE, MCO, IMMT1, IMMT2, OMMT1, OMMT2, OSTM (SRMは共通ファイルではないので未対応) 両エンドにCAL_LINE_OUTのRFMを追加 K1:VIS-{optic}P_CAL_CS_{MN,IM,TM}_LINE optic: ETMX, ETMY GitID: Brfore: release/0.1.38 After: release/0.1.39 GpsTime: 1318317850 --- Update of VIS model files The following VIS model files have been updated. Requested by Yamamoto-san Tower: Due to the severe total data volume, TOWER_MASTER/TOWER_MASTER will be split into different Types in order to reduce DQ channels. We had planned to create the following three models and replace them, but we decided to implement only Type-A and not Type-B and Bp. First, I created the following files in the common files. Only ETMX, ETMY, ITMX, and ITMY were updated today. BS, SR2, SR3, PRM, PR2, PR3 have not been changed yet. The reason why we were not able to support them is that DAQ Timig error 0x4000 and 0x5000 occurred frequently. We will revisit these next week. The changed file is left as k1visXXX_new.mdl. While I was working on it, k1vissr2p hung when I rebooted it, so I disabled Dolphon and got it back up. However, k1ioo1 and k1srm lost their Dolphin connections along the way, so I rebooted them both. TOWER_MASTER/TYPEA_TOWER_MASTER TOWER_MASTER/TYPEB_TOWER_MASTER TOWER_MASTER/TYPEBP_TOWER_MASTER The changes from TOWER_MASTER are as follows. TOWER_MASTER/TYPEA_TOWER_MASTER SF: Removed TOWER_MASTER/TYPEB_TOWER_MASTER F2,F3,SF: delete BF: Deleted MNOLDAMP and PFOLDAMP and made them common with Type-Bp. V1,V2,V3,H1,H2,H3 and LTVRPY are connected to GND and Terminator in TYPEB_TOWER_MASTER instead of Top hierarchy. BIO: Only PI and GAS should be used. GASMODAL: Changed to three levels (F1, F2, BF) SHMEM:   Remove K1:VIS-{optic}P_TM_OPLEV_{L,P,Y}_OUT (added in K-Log#17368, but not necessary for Type-B)   optic: BS, SR2, SR3 (BS is not a common file, so it is not included)  Also removed from Payload side TOWER_MASTER/TYPEBP_TOWER_MASTER IP,F0,F1,F2,F3: delete BF: Deleted MNOLDAMP and PFOLDAMP. GASMODAL: Changed to two levels of SF and BF (added). BIO: delete PI, make GAS, BFH, BFH only Request from Ushiba-san Tower: Move ACCALIGN to before ACC2EUL and ACCBLEND Add FLDACCALIGN between FLDACC2EUL and ACCBLEND  K1;VIS-{optic}_IP_FLDACCALIGN  optic: ETMX, ETMY,ITMX,ITMY BS, SR2 and SR3 are unchanged.  (SRM is not yet supported because it is not a common file) Request from Yamamoto-san Payload:. Renamed from HIRE_SWITCH to HIRESWITCH. To match the name with Ligo. K1:VIS-{optic}_HIERSWITCH optic: ETMX, ETMY, ITMX, ITMY Add LOCK_OUTSW to TM. Add K1:VIS-{optic}_TM_LOCK_OUTSW (same as MN) optic: ETMX, ETMY, ITMX, ITMY, BS, SR2, SR3, PRM, PR2, PR3, MCI, MCE, MCO, IMMT1, IMMT2, OMMT1, OMMT2, OSTM (SRM is not supported because it is not a common file) Add RFM for CAL_LINE_OUT on both ends K1:VIS-{optic}P_CAL_CS_{MN,IM,TM}_LINE optic: ETMX, ETMY GitID: Brfore: release/0.1.38 After: release/0.1.39 GpsTime: 1318317850