@@ -127,29 +127,39 @@ public static synchronized void Load(int runno, ConstantsManager manager) {
127127 AHDC_RAW_HIT_CUTS .put (Integer .valueOf (key ), params );
128128 }
129129
130- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
131- // AHDC ADC gains (UPDATED SCHEMA)
132- // keys : sector, layer, component
133- // columns: gainCorr, dgainCorr, extra1, extra2, extra3
134- for (int i = 0 ; i < ahdc_adcGains .getRowCount (); i ++) {
135- int sector = Integer .parseInt ((String ) ahdc_adcGains .getValueAt (i , 0 ));
136- int layer = Integer .parseInt ((String ) ahdc_adcGains .getValueAt (i , 1 ));
137- int component = Integer .parseInt ((String ) ahdc_adcGains .getValueAt (i , 2 ));
130+
131+ // AHDC ADC gains table
132+ // keys : sector, layer, component
133+ // cols : gainCorr, dgainCorr, extra1, extra2, extra3
138134
139- double gainCorr = ahdc_adcGains . getDoubleValue ( "gainCorr" , sector , layer , component );
140- double dgainCorr = ahdc_adcGains .getDoubleValue ( "dgainCorr" , sector , layer , component );
135+ if ( ahdc_adcGains != null ) {
136+ for ( int i = 0 ; i < ahdc_adcGains .getRowCount (); i ++) {
141137
142- double extra1 = 0.0 , extra2 = 0.0 , extra3 = 0.0 ;
143- try { extra1 = ahdc_adcGains .getDoubleValue ("extra1" , sector , layer , component ); } catch (Exception e ) {}
144- try { extra2 = ahdc_adcGains .getDoubleValue ("extra2" , sector , layer , component ); } catch (Exception e ) {}
145- try { extra3 = ahdc_adcGains .getDoubleValue ("extra3" , sector , layer , component ); } catch (Exception e ) {}
138+ int sector = Integer .parseInt ((String ) ahdc_adcGains .getValueAt (i , 0 ));
139+ int layer = Integer .parseInt ((String ) ahdc_adcGains .getValueAt (i , 1 ));
140+ int component = Integer .parseInt ((String ) ahdc_adcGains .getValueAt (i , 2 ));
146141
147- int key = sector * 10000 + layer * 100 + component ;
148- double params [] = { gainCorr , dgainCorr , extra1 , extra2 , extra3 };
149- AHDC_ADC_GAINS .put (Integer .valueOf (key ), params );
150- }
142+ double gainCorr = ahdc_adcGains .getDoubleValue ("gainCorr" , sector , layer , component );
143+ double dgainCorr = ahdc_adcGains .getDoubleValue ("dgainCorr" , sector , layer , component );
151144
152- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
145+ double extra1 = 0.0 , extra2 = 0.0 , extra3 = 0.0 ;
146+ try { extra1 = ahdc_adcGains .getDoubleValue ("extra1" , sector , layer , component ); } catch (Exception e ) {}
147+ try { extra2 = ahdc_adcGains .getDoubleValue ("extra2" , sector , layer , component ); } catch (Exception e ) {}
148+ try { extra3 = ahdc_adcGains .getDoubleValue ("extra3" , sector , layer , component ); } catch (Exception e ) {}
149+
150+ int key = sector * 10000 + layer * 100 + component ;
151+ AHDC_ADC_GAINS .put (key , new double []{gainCorr , dgainCorr , extra1 , extra2 , extra3 });
152+ }
153+ }
154+
155+
156+
157+
158+
159+
160+
161+
162+ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
153163 // AHDC time_over_threshold (NEW TABLE)
154164 // keys : sector, layer, component
155165 // columns: totCorr, dtotCorr, extra1, extra2, extra3
0 commit comments