Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
CCS Operator Account committed May 31, 2019
2 parents 45cfbd5 + 3310f44 commit 904083e
Show file tree
Hide file tree
Showing 22 changed files with 7,780 additions and 1,213 deletions.
14 changes: 13 additions & 1 deletion IR2/lsst-dc06/FocalPlaneSubsystem.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,17 @@ builder.

for (Raft raftGeometry : focalPlane.getChildrenList() ) {
System.out.println("Looping on Raft "+raftGeometry.getName());


def raft = raftGeometry.getName()


// TempCtrl (TempControl, gain: 0.1, timeConst: 120.0, smoothTime: 20.0,
// "$raft" () {
TempCtrl (TempControl, gain: 0.1, timeConst: 120.0, smoothTime: 20.0,
maxOutput: 5.6, awGain: 4.0, basePower: 0.0, tolerance: 0.05,
updateTime: 30000, rebs: ["${raft}/Reb0", "${raft}/Reb2"], tempChans: ["${raft}/Reb0/S01/Temp", "${raft}/Reb1/S11/Temp"])
// }

for (Reb rebGeometry : raftGeometry.getChildrenList() ) {
def rebCount = ((10*raftGeometry.getParallelPosition())+raftGeometry.getSerialPosition())*4+rebGeometry.getParallelPosition();
def reb = raftGeometry.getName()+"/"+rebGeometry.getName();
Expand All @@ -86,6 +96,8 @@ builder.
"Bias$j" (BiasControl, hwChan: j) // All REBs, physical values
}



String title = "${reb} temperatures\\"
for (int j = 1; j <= 10; j++) {
// Per Stuart Marshall. for 2 ETU testing will will set limits on Temps 1 and 2
Expand Down
4 changes: 3 additions & 1 deletion IR2/lsst-dc06/comcam-fp.app
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
org.lsst.ccs.application.mainClass=org.lsst.ccs.startup.SubsystemBoot
org.lsst.ccs.application.args=--description FocalPlaneSubsystem --alias comcam-fp --configuration ""
org.lsst.ccs.application.description=Run the ComCam FocalPlane Subsystem
org.lsst.ccs.application.description=Run the comcam-fp FocalPlane Subsystem
org.lsst.ccs.ld.library.path=Daq2
org.lsst.ccs.dbUrl=jdbc:mysql://lsst-ir2db01.slac.stanford.edu:3306/ir2dbprod?user=ccs&password=ccs23&autoReconnect=true
org.lsst.ccs.rafts.partition=comcam
org.lsst.ccs.subsystem.agent.property.group=comcam
1 change: 0 additions & 1 deletion IR2/lsst-dc06/comcam-fp.properties
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
focalPlaneConfig/FITSRootDirectory = /gpfs/slac/lsst/fs3/g/data/R_and_D/comcam/
18 changes: 17 additions & 1 deletion IR2/lsst-dc06/comcam-fp__FitsHandling.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
#******** focalPlaneConfig/FITSAutoSave
#** category : FitsHandling
#********
focalPlaneConfig/FITSAutoSave = true

#******** focalPlaneConfig/FITSDirectoryPattern
#** category : FitsHandling
#********
focalPlaneConfig/FITSDirectoryPattern = ${imageDate}/${imageName}

#******** focalPlaneConfig/FITSFilePattern
#** category : FitsHandling
#********
focalPlaneConfig/FITSFilePattern = ${imageName}_${raftName}_S${sensorLoc}.fits

#******** focalPlaneConfig/FITSRootDirectory
#** category : FitsHandling
#********
focalPlaneConfig/FITSRootDirectory = /gpfs/slac/lsst/fs3/g/data/R_and_D/comcam/
focalPlaneConfig/FITSDirectoryPattern = ${imageDate}/${imageName}

61 changes: 50 additions & 11 deletions IR2/lsst-dc06/comcam-fp__HardwareId.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,50 @@
# Correct for 2ETU testing
R22/name: LCA-11021_RTM-031
R22/Reb0/S00/name: ITL-3800C-229
R22/Reb0/S01/name: ITL-3800C-251
R22/Reb0/S02/name: ITL-3800C-215
R22/Reb1/S10/name: ITL-3800C-326
R22/Reb1/S11/name: ITL-3800C-283
R22/Reb1/S12/name: ITL-3800C-243
R22/Reb2/S20/name: ITL-3800C-319
R22/Reb2/S21/name: ITL-3800C-209
R22/Reb2/S22/name: ITL-3800C-206
#******** R22/name
#** category : HardwareId
#********
R22/name = LCA-11021_RTM-031

#******** R22/Reb0/S00/name
#** category : HardwareId
#********
R22/Reb0/S00/name = ITL-3800C-229

#******** R22/Reb0/S01/name
#** category : HardwareId
#********
R22/Reb0/S01/name = ITL-3800C-251

#******** R22/Reb0/S02/name
#** category : HardwareId
#********
R22/Reb0/S02/name = ITL-3800C-215

#******** R22/Reb1/S10/name
#** category : HardwareId
#********
R22/Reb1/S10/name = ITL-3800C-326

#******** R22/Reb1/S11/name
#** category : HardwareId
#********
R22/Reb1/S11/name = ITL-3800C-283

#******** R22/Reb1/S12/name
#** category : HardwareId
#********
R22/Reb1/S12/name = ITL-3800C-243

#******** R22/Reb2/S20/name
#** category : HardwareId
#********
R22/Reb2/S20/name = ITL-3800C-319

#******** R22/Reb2/S21/name
#** category : HardwareId
#********
R22/Reb2/S21/name = ITL-3800C-209

#******** R22/Reb2/S22/name
#** category : HardwareId
#********
R22/Reb2/S22/name = ITL-3800C-206

Loading

0 comments on commit 904083e

Please sign in to comment.