Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,14 @@ public final void setSectorLayerComponent(int sector, int layer, int comp){
this.dt_COMPONENT = comp;
}

public final void setSectorLayerComponentOrderType(int sector, int layer, int comp, int order, int type) {
this.dt_SECTOR = sector;
this.dt_LAYER = layer;
this.dt_COMPONENT = comp;
this.dt_ORDER = order;
this.detectorType = DetectorType.getType(type);
}

public static int generateHashCode(int s, int l, int c){
return ((s<<24)&0xFF000000)|
((l<<16)&0x00FF0000)|(c&0x0000FFFF);
Expand All @@ -99,7 +107,6 @@ public int getHashCode(){
(this.dt_COMPONENT&0x00000FFF);
return hash;
}


public void copy(DetectorDescriptor desc){
this.hw_SLOT = desc.hw_SLOT;
Expand All @@ -119,7 +126,6 @@ public boolean compare(DetectorDescriptor desc){
return false;
}


public static String getName(String base, int... ids){
StringBuilder str = new StringBuilder();
str.append(base);
Expand Down

Large diffs are not rendered by default.

Loading