Skip to content

Use new exp off PV #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slominskir merged 2 commits into from
May 1, 2025
Merged

Use new exp off PV #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a4702e
Use new exp off PV
slominskir May 1, 2025
69970e3
Update Test Cases
slominskir May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions container/softioc/db/default_data.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ caput -a BOOMHLDOFF_h 168 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600
caput -a HLA:bta_sec_enr_h 168 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600
caput -a HLB:bta_sec_er_h 168 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600
caput -a HLC:bta_sec_cc_h 168 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600
caput -a HLD:bta_sec_off_h 168 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600


# Time PVS
Expand Down
23 changes: 23 additions & 0 deletions container/softioc/db/macros.db
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,4 +299,27 @@
field(SIML,"")
field(SIMS,"NO_ALARM")
field(ASG,"DEFAULT")
}
record(histogram,"HL$(HALL):bta_sec_off_h") {
field(DESC,"histogram record")
field(SCAN,"Passive")
field(PINI,"NO")
field(PHAS,"0")
field(EVNT,"0")
field(DTYP,"Soft Channel")
field(DISV,"1")
field(SDIS,"0.000000000000000e+00")
field(DISS,"NO_ALARM")
field(PRIO,"LOW")
field(FLNK,"0.000000000000000e+00")
field(NELM,"168")
field(ULIM,"168")
field(LLIM,"1")
field(SVL,"0.000000000000000e+00")
field(MDEL,"0")
field(SDEL,"0.0000000e+00")
field(SIOL,"")
field(SIML,"")
field(SIMS,"NO_ALARM")
field(ASG,"DEFAULT")
}
2 changes: 1 addition & 1 deletion src/main/java/org/jlab/btm/business/service/ExpHourService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public ExpShiftAvailability getHallAvailability(
try {
epicsHourList = findInEpics(hall, startHour, endHour, true);
} catch (UserFriendlyException e) {
logger.log(Level.FINEST, "Unable to obtain EPICS hall hour data", e);
logger.log(Level.WARNING, "Unable to obtain EPICS hall hour data", e);
epicsHourList = new ArrayList<>();
}
} else {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/jlab/btm/persistence/epics/Constant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,5 @@ public class Constant {
public static final String EXP_ER_SUFFIX = ":bta_sec_er_h";
public static final String EXP_PCC_SUFFIX = ":bta_sec_cc_h";
public static final String EXP_UED_SUFFIX = ":bta_sec_enr_h";
public static final String EXP_OFF_SUFFIX = ":bta_sec_off_h";
}
1 change: 0 additions & 1 deletion src/main/java/org/jlab/btm/persistence/epics/ExperimenterAccounting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ public List<ExpHour> getExpHallHours() {
hour.setPccSeconds((short) pcc[i]);
hour.setUedSeconds((short) ued[i]);

// This is really part of CC PVS...
hour.setOffSeconds((short) off[i]);

hours.add(hour);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jlab/btm/persistence/epics/ExperimenterAccountingDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public ExperimenterAccounting loadAccounting()
channelNames.add(Constant.EXP_HALL_PREFIX + hall + Constant.EXP_PCC_SUFFIX);
channelNames.add(Constant.EXP_HALL_PREFIX + hall + Constant.EXP_UED_SUFFIX);

channelNames.add(Constant.HALL_PREFIX + hall + Constant.HALL_OFF_SUFFIX);
channelNames.add(Constant.EXP_HALL_PREFIX + hall + Constant.EXP_OFF_SUFFIX);

List<DBR> dbrs = SimpleGet.doAsyncGet(context, channelNames);

Expand Down
Loading