@@ -28,7 +28,6 @@ public class Composition extends Matter {
28
28
public static final double ISOTOPE = C13 - C ;
29
29
public static final double ISOTOPE2 = C14 - C ;
30
30
public static final double PROTON = 1.00727649 ;
31
- // public static final double PROTON = 1.007825035;
32
31
public static final double NEUTRON = 1.0086650 ;
33
32
public static final double SODIUM_CHARGE_CARRIER_MASS = 22.98922189 ;
34
33
public static final double POTASSIUM_CHARGE_CARRIER_MASS = 38.96315989 ;
@@ -43,9 +42,11 @@ public class Composition extends Matter {
43
42
setChargeCarrierMass (PROTON );
44
43
}
45
44
46
- int number ; // MSB 8 (C) 8 (H) 6 (N) 6 (O) 4 (S)
47
- static final double [] monoMass = new double []{C , H , N , O , S };
48
- static final float [] avgMass = new float []{12.011f , 1.00794f , 14.00674f , 15.9994f , 32.066f };
45
+ int number ;
46
+
47
+ // Unused:
48
+ // static final double[] monoMass = new double[]{C, H, N, O, S};
49
+ // static final float[] avgMass = new float[]{12.011f, 1.00794f, 14.00674f, 15.9994f, 32.066f};
49
50
50
51
public static final double OffsetY () {
51
52
return offsetY ;
@@ -167,14 +168,15 @@ public static float getMonoMass(int number) {
167
168
(number & 0x0000000F ) * Composition .S );
168
169
}
169
170
170
- public static float getAvgMass (int number ) {
171
- return
172
- ((number & 0xFF000000 ) >>> 24 ) * avgMass [0 ] +
173
- ((number & 0x00FF0000 ) >> 16 ) * avgMass [1 ] +
174
- ((number & 0x0000FC00 ) >> 10 ) * avgMass [2 ] +
175
- ((number & 0x000003F0 ) >> 4 ) * avgMass [3 ] +
176
- (number & 0x0000000F ) * avgMass [4 ];
177
- }
171
+ // Unused:
172
+ // public static float getAvgMass(int number) {
173
+ // return
174
+ // ((number & 0xFF000000) >>> 24) * avgMass[0] +
175
+ // ((number & 0x00FF0000) >> 16) * avgMass[1] +
176
+ // ((number & 0x0000FC00) >> 10) * avgMass[2] +
177
+ // ((number & 0x000003F0) >> 4) * avgMass[3] +
178
+ // (number & 0x0000000F) * avgMass[4];
179
+ // }
178
180
179
181
@ Override
180
182
public float getMass () {
@@ -190,9 +192,10 @@ public int getNominalMass() {
190
192
return getC () * 12 + getH () * 1 + getN () * 14 + getO () * 16 + getS () * 32 ;
191
193
}
192
194
193
- public float getAvgMass () {
194
- return getC () * avgMass [0 ] + getH () * avgMass [1 ] + getN () * avgMass [2 ] + getO () * avgMass [3 ] + getS () * avgMass [4 ];
195
- }
195
+ // Unused:
196
+ //public float getAvgMass() {
197
+ // return getC() * avgMass[0] + getH() * avgMass[1] + getN() * avgMass[2] + getO() * avgMass[3] + getS() * avgMass[4];
198
+ //}
196
199
197
200
public String toString () {
198
201
return new String (getC () + " " + getH () + " " + getN () + " " + getO () + " " + getS ());
0 commit comments