Skip to content
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

WIP: Add SWT, requires PR #132 #133

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

WIP: Add SWT, requires PR #132 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d2bd66a
Move fcio to it's own directory
ssailer Mar 1, 2024
6967e52
Align formatting.
ssailer Mar 1, 2024
eb93fe2
Fix type in function name.
ssailer Mar 1, 2024
64c72df
Add additional signal, which allows connected objects to find out if …
ssailer Mar 1, 2024
2e1a724
Add missing taskCompleted method to the model.
ssailer Mar 1, 2024
e609e27
Refactor of the listener taking the updated fcio library into account.
ssailer Mar 1, 2024
e4f5d65
Increase the size of the Readout window, giving all table fields spac…
ssailer Mar 1, 2024
e4507d4
Add software trigger source code and bump object version.
ssailer Mar 13, 2024
e812d1a
Add swt components to listener and adc cards. Remove not needed param…
ssailer Mar 13, 2024
fe2d100
Add software trigger parameters to Card interfaces. Remove not needed…
ssailer Mar 13, 2024
9e2124c
Allow scanning the full range of the event for peak sums.
ssailer Mar 13, 2024
86f852c
Updated fsp.
ssailer Mar 26, 2024
e1af489
Add SWT monitoring to Readout Object.
ssailer Mar 26, 2024
b93b78d
Update fc-stream-processor to latest.
ssailer May 10, 2024
ab36ca6
Pull FSP Bugfix.
ssailer May 12, 2024
a5b8046
Fix if else chain.
ssailer Jun 8, 2024
c5c5a70
Pull new fsp version; contains a bugfix for rare timestamp updates. S…
ssailer Jun 8, 2024
69abed4
Pull fsp updates. Fixes a bug with timestamp updates in the buffer wi…
ssailer Jun 9, 2024
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
6 changes: 3 additions & 3 deletions Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>ORCA</string>
<key>CFBundleShortVersionString</key>
<string>12.0h</string>
<key>CFBundleSignature</key>
<string>ORCA</string>
<key>CFfile://localhost/Users/markhowe/Dev/Orca/Source/Objects/Misc%20Objects/SQL/BundleGetInfoString</key>
<string>Orca 12, Copyright ©2014 Mark Howe Physics Dept, University of North Carolina</string>
<key>LSMinimumSystemVersion</key>
<string>10.6</string>
<string>10.15</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
Expand Down
143 changes: 126 additions & 17 deletions Orca.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Orca.xcodeproj/xcshareddata/xcschemes/Orca.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
10 changes: 5 additions & 5 deletions Source/Experiments/LEGEND/L200/ORL200Model.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,15 +1171,15 @@ - (void) influxLoadSetUp:(NSString*)name segmentId:(int)groupIndex timeStamp:(NS
[aCmd addField: @"trigOutEnable" withBoolean:[hw trigOutEnabled:chan]];
[aCmd addField: @"threshold" withLong:[hw threshold:chan]];
[aCmd addField: @"adcGain" withLong:[hw adcGain:chan]];
[aCmd addField: @"trigGain" withLong:[hw trigGain:chan]];
// [aCmd addField: @"trigGain" withLong:[hw trigGain:chan]];
[aCmd addField: @"baseLineDAC" withLong:[hw baseline:chan]];
[aCmd addField: @"shapeTime" withLong:[hw shapeTime:chan]];
[aCmd addField: @"filterType" withLong:[hw filterType:chan]];
[aCmd addField: @"flatTopTime" withLong:[hw flatTopTime:chan]];
// [aCmd addField: @"filterType" withLong:[hw filterType:chan]];
// [aCmd addField: @"flatTopTime" withLong:[hw flatTopTime:chan]];
[aCmd addField: @"poleZeroTime" withLong:[hw poleZeroTime:chan]];
[aCmd addField: @"postTrigger" withLong:[hw postTrigger:chan]];
// [aCmd addField: @"postTrigger" withLong:[hw postTrigger:chan]];
[aCmd addField: @"baselineSlew" withLong:[hw baselineSlew:chan]];
[aCmd addField: @"swTrigInclude" withLong:[hw swTrigInclude:chan]];
[aCmd addField: @"swTrigInclude" withLong:[hw swtInclude:chan]];

//card level settings
[aCmd addField: @"promSlot" withLong:[hw promSlot]];
Expand Down
50 changes: 25 additions & 25 deletions Source/Objects/Control/RunControl/ORRunController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,31 +279,31 @@ - (void) registerNotificationObservers

- (void) updateWindow
{
[super updateWindow];
[self populatePopups];
[self runStatusChanged:nil];
[self timedRunChanged:nil];
[self repeatRunChanged:nil];
[self elapsedTimesChanged:nil];
[self startTimeChanged:nil];
[self runNumberChanged:nil];
[self runNumberDirChanged:nil];
[self runModeChanged:nil];
[self runTypeChanged:nil];
[self remoteControlChanged:nil];
[self runNumberLockChanged:nil];
[self runTypeLockChanged:nil];
[self quickStartChanged:nil];
[self definitionsFileChanged:nil];
[self startUpScriptStateChanged:nil];
[self shutDownScriptStateChanged:nil];
[self startUpScriptChanged:nil];
[self shutDownScriptChanged:nil];
[self vetosChanged:nil];
[self timeLimitChanged:nil];
[self numberOfWaitsChanged:nil];
[groupView setNeedsDisplay:YES];
[self selectedRunTypeScriptChanged:nil];
[super updateWindow];
[self populatePopups];
[self runStatusChanged:nil];
[self timedRunChanged:nil];
[self repeatRunChanged:nil];
[self elapsedTimesChanged:nil];
[self startTimeChanged:nil];
[self runNumberChanged:nil];
[self runNumberDirChanged:nil];
[self runModeChanged:nil];
[self runTypeChanged:nil];
[self remoteControlChanged:nil];
[self runNumberLockChanged:nil];
[self runTypeLockChanged:nil];
[self quickStartChanged:nil];
[self definitionsFileChanged:nil];
[self startUpScriptStateChanged:nil];
[self shutDownScriptStateChanged:nil];
[self startUpScriptChanged:nil];
[self shutDownScriptChanged:nil];
[self vetosChanged:nil];
[self timeLimitChanged:nil];
[self numberOfWaitsChanged:nil];
[groupView setNeedsDisplay:YES];
[self selectedRunTypeScriptChanged:nil];
}


Expand Down
857 changes: 423 additions & 434 deletions Source/Objects/Hardware/Internet/FlashCam/FlashCamADC/FlashCamADC.xib
View file
Open in desktop

Large diffs are not rendered by default.

1,288 changes: 830 additions & 458 deletions Source/Objects/Hardware/Internet/FlashCam/FlashCamADC/FlashCamADCStd.xib
View file
Open in desktop

Large diffs are not rendered by default.

39 changes: 24 additions & 15 deletions Source/Objects/Hardware/Internet/FlashCam/FlashCamADC/ORFlashCamADCController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@
IBOutlet NSMatrix* baselineMatrix;
IBOutlet NSMatrix* thresholdMatrix;
IBOutlet NSMatrix* adcGainMatrix;
IBOutlet NSMatrix* trigGainMatrix;
// IBOutlet NSMatrix* trigGainMatrix;
IBOutlet NSMatrix* shapeTimeMatrix;
IBOutlet NSMatrix* filterTypeMatrix;
IBOutlet NSMatrix* flatTopTimeMatrix;
// IBOutlet NSMatrix* filterTypeMatrix;
// IBOutlet NSMatrix* flatTopTimeMatrix;
IBOutlet NSMatrix* poleZeroTimeMatrix;
IBOutlet NSMatrix* postTriggerMatrix;
// IBOutlet NSMatrix* postTriggerMatrix;
IBOutlet NSMatrix* baselineSlewMatrix;
IBOutlet NSMatrix* swTrigIncludeMatrix;
IBOutlet NSMatrix* swtIncludeMatrix;
IBOutlet NSMatrix* swtCalibrationMatrix;
IBOutlet NSMatrix* swtThresholdMatrix;
IBOutlet NSMatrix* swtShapingTimeMatrix;
IBOutlet NSTextField* baseBiasTextField;
IBOutlet NSTextField* shapingLabel;
IBOutlet NSTextField* flatTopLabel;
Expand Down Expand Up @@ -80,14 +83,17 @@
- (void) baselineChanged:(NSNotification*)note;
- (void) thresholdChanged:(NSNotification*)note;
- (void) adcGainChanged:(NSNotification*)note;
- (void) trigGainChanged:(NSNotification*)note;
//- (void) trigGainChanged:(NSNotification*)note;
- (void) shapeTimeChanged:(NSNotification*)note;
- (void) filterTypeChanged:(NSNotification*)note;
- (void) flatTopTimeChanged:(NSNotification*)note;
//- (void) filterTypeChanged:(NSNotification*)note;
//- (void) flatTopTimeChanged:(NSNotification*)note;
- (void) poleZeroTimeChanged:(NSNotification*)note;
- (void) postTriggerChanged:(NSNotification*)note;
//- (void) postTriggerChanged:(NSNotification*)note;
- (void) baselineSlewChanged:(NSNotification*)note;
- (void) swTrigIncludeChanged:(NSNotification*)note;
- (void) swtIncludeChanged:(NSNotification*)note;
- (void) swtCalibrationChanged:(NSNotification*)note;
- (void) swtThresholdChanged:(NSNotification*)note;
- (void) swtShapingTimeChanged:(NSNotification*)note;
- (void) baseBiasChanged:(NSNotification*)note;
- (void) majorityLevelChanged:(NSNotification*)note;
- (void) majorityWidthChanged:(NSNotification*)note;
Expand All @@ -108,14 +114,17 @@
- (IBAction) baselineAction:(id)sender;
- (IBAction) thresholdAction:(id)sender;
- (IBAction) adcGainAction:(id)sender;
- (IBAction) trigGainAction:(id)sender;
//- (IBAction) trigGainAction:(id)sender;
- (IBAction) shapeTimeAction:(id)sender;
- (IBAction) filterTypeAction:(id)sender;
- (IBAction) flatTopTimeAction:(id)sender;
//- (IBAction) filterTypeAction:(id)sender;
//- (IBAction) flatTopTimeAction:(id)sender;
- (IBAction) poleZeroTimeAction:(id)sender;
- (IBAction) postTriggerAction:(id)sender;
//- (IBAction) postTriggerAction:(id)sender;
- (IBAction) baselineSlewAction:(id)sender;
- (IBAction) swTrigIncludeAction:(id)sender;
- (IBAction) swtIncludeAction:(id)sender;
- (IBAction) swtCalibrationAction:(id)sender;
- (IBAction) swtThresholdAction:(id)sender;
- (IBAction) swtShapingTimeAction:(id)sender;
- (IBAction) baseBiasAction:(id)sender;
- (IBAction) majorityLevelAction:(id)sender;
- (IBAction) majorityWidthAction:(id)sender;
Expand Down
Loading