From Mark Arndt, 12 July 2011 * Renaming two existing inputs * Using one of the renamed inputs in a logic section that involves embedded C code ================== Renaming/remapping two existing inputs The input from Link Node 40 card 1, channel 16 would now be CXI_DSD_MMS_07_B_POSITION This renamed input would be used in revised code block below The input from Link Node 40 card 6, channel 2 would now be CXI_DSU_MMS_07_B_POSITION Input "XCS_DG3_VGC_01..." exists, but per conversation with XCS, will not be used. =================== Modifying an existing C code block In section "CXI Configuration 4 Summary". I pulled the current version of this code from: /afs/slac.stanford.edu/g/lcls/vol8/epics/iocTop/MachineProtection/mpsConfiguration-R1-92/algorithm/2010-12-06-a/CXI_Cfg_Four-Logic-R3.c Back in December we provided these .c files to Matt and I think he did some scrubbing on them, so I started with -R3. The revised file is attached as -R4. I make use of the new CXI_DSD_MMS_07_B_POSITION input. =================== Just a heads up about the input that is being moved to Link Node 40 card 6, channel 2: * The input is called CXI_DSU_MMS_07_B_POSITION. There is a mnemonic correction here - Note the change to "MMS_B" from "MMM_B". If it is for any reason easier to leave the mnemonic as is, please do. * This input is used in "CXI Configuration 5 Summary". That logic is not being changed, but it still needs to be satisfied. If you are going to change to the "MMS_B" mnemonic, and I need to send you a modified c file for Cfg 5 that uses the new mnemonic, please let me know. Change By M. Boyes =================== Config changes are: Link Node 40 card 1, channel 16 is now CXI_DSU_MMM_07_B_POSITION becomes CXI_DSD_MMS_07_B_POSITION Link Node 40 card 6, channel 2 is now XCS_DG3_VGC_01_OPN_DI_POSITION becomes CXI_DSU_MMS_07_B_POSITION XCS_DG3_VGC_01_OPN_DI_POSITION is removed from configuration DB and logic DB device list. It was not used on any logic tables. =================== Logic changes are: * Cleanup--> removed old names from logic device list that are no longer in config DB and have no logic [mboyes@lcls-dev2:2011-07-12-a]$ sdiff ../../database/2011-07-12-a/devices/configuration_devices.txt devices/logic_devices.txt | grep ">" > PPS_FEE1_1_STPR01_IN_POSITION > PPS_FEE1_1_STPR01_OUT_POSITION > XCS_DG3_VGC_01_OPN_DI_POSITION > XRT_DIA_DET_01_MPSFAULT_STATUS * Since we can NOT delete entries, rename them to a junk name ok since no logic with these names. Diff now is: [mboyes@lcls-dev2:2011-07-12-a]$ sdiff ../../database/2011-07-12-a/devices/configuration_devices.txt devices/logic_devices.txt | grep ">" > removed_input_do_NOT_use_1 > removed_input_do_NOT_use_2 > removed_input_do_NOT_use_3 > removed_input_do_NOT_use_4 * Add new device (rename a junk name to new device CXI_DSD_MMS_07_B_POSITION) * Change name of CXI_DSU_MMM_07_B_POSITION to CXI_DSU_MMS_07_B_POSITION * Add revised CXI_Config4 logic C code * Update CXI_Config5 with name modification (CXI_DSU_MMM_07_B_POSITION to CXI_DSU_MMS_07_B_POSITION) * Alg diff changes show 6 changes: signal name change in config 5, and config 4 changes that are all expected. [mboyes@lcls-dev2:algorithm]$ sdiff -bs 2011-07-05-a/src/Algorithm.h 2011-07-12-a/src/Algorithm.h /* Evaluate inputs to identify if we're in be | /* Evaluate inputs to identify if we're in be > (! CXI_DSD_MMS_07_B_POSITION) || < < (! CXI_DSU_MMM_07_B_POSITION) | (! CXI_DSU_MMS_07_B_POSITION) /* Evaluate inputs to identify if we're in be | /* Evaluate inputs to identify if we're in be > (! CXI_DSD_MMS_07_B_POSITION) || < < (! CXI_DSU_MMM_07_B_POSITION) | (! CXI_DSU_MMS_07_B_POSITION)