diff --git a/ChangeLog.md b/ChangeLog.md
index 6321f38..53fcec7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,12 @@
## Change Log
### 3.21-3.27
-* `Visio`的`UML`类图初步制作
\ No newline at end of file
+* `Visio`鐨刞UML`绫诲浘鍒濇鍒朵綔
+* 闅忔満淇″彿鐨勭敓鎴怺^1]
+
+### 5.24
+* 闅忔満淇″彿鐨勫畬鍠
+
+### 5.30
+* control view
+
+[^1]: Xiao M, Hu R, Ge L Q, et al. Study of a full-digital multi-waveform nuclear pulse signal generator[J]. Applied Radiation and Isotopes, 2022, 179: 110028.
\ No newline at end of file
diff --git a/MCA/ControlView.cpp b/MCA/ControlView.cpp
index 2492c35..ccb631a 100644
--- a/MCA/ControlView.cpp
+++ b/MCA/ControlView.cpp
@@ -16,7 +16,6 @@ IMPLEMENT_DYNCREATE(CControlView, CFormView)
CControlView::CControlView()
: CFormView(IDD_DIALOG_CONTROL)
{
-
}
CControlView::~CControlView()
@@ -29,6 +28,7 @@ void CControlView::DoDataExchange(CDataExchange* pDX)
}
BEGIN_MESSAGE_MAP(CControlView, CFormView)
+ ON_WM_SIZE()
END_MESSAGE_MAP()
@@ -50,3 +50,16 @@ void CControlView::Dump(CDumpContext& dc) const
// CControlView 娑堟伅澶勭悊绋嬪簭
+
+
+void CControlView::OnSize(UINT nType, int cx, int cy)
+{
+ CFormView::OnSize(nType, cx, cy);
+ CRect rect;
+ GetClientRect(&rect); // 鑾峰彇褰撳墠瀹㈡埛鍖簐iew澶у皬
+
+ CSize size;
+ size.cx = rect.right - rect.left;
+ size.cy = rect.bottom - rect.top;
+ SetScrollSizes(MM_HIMETRIC, size); // 灏咰ScrollView鐨勫ぇ灏忚缃负褰撳墠瀹㈡埛鍖哄ぇ灏
+}
\ No newline at end of file
diff --git a/MCA/ControlView.h b/MCA/ControlView.h
index 704fd2a..2c182d4 100644
--- a/MCA/ControlView.h
+++ b/MCA/ControlView.h
@@ -28,6 +28,7 @@ protected:
DECLARE_MESSAGE_MAP()
public:
+ afx_msg void OnSize(UINT nType, int cx, int cy);
};
diff --git a/MCA/MCA.cpp b/MCA/MCA.cpp
index ced294b..2ce5fbd 100644
--- a/MCA/MCA.cpp
+++ b/MCA/MCA.cpp
@@ -151,7 +151,7 @@ protected:
// 瀹炵幇
protected:
- DECLARE_MESSAGE_MAP()
+ DECLARE_MESSAGE_MAP();
};
CAboutDlg::CAboutDlg() noexcept : CDialogEx(IDD_ABOUTBOX)
@@ -174,6 +174,3 @@ void CMCAApp::OnAppAbout()
}
// CMCAApp 娑堟伅澶勭悊绋嬪簭
-
-
-
diff --git a/MCA/MCA.rc b/MCA/MCA.rc
index 35835fe..d76ac03 100644
Binary files a/MCA/MCA.rc and b/MCA/MCA.rc differ
diff --git a/MCA/MCA.vcxproj b/MCA/MCA.vcxproj
index 7c11a38..423c4aa 100644
--- a/MCA/MCA.vcxproj
+++ b/MCA/MCA.vcxproj
@@ -214,6 +214,9 @@
+
+
+
diff --git a/MCA/MCA.vcxproj.filters b/MCA/MCA.vcxproj.filters
index 756565b..780b105 100644
--- a/MCA/MCA.vcxproj.filters
+++ b/MCA/MCA.vcxproj.filters
@@ -13,6 +13,9 @@
{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+ {5f85e690-53f6-4e18-9b27-e5968d458c94}
+
@@ -84,6 +87,15 @@
璧勬簮鏂囦欢
+
+ 璇存槑鏂囦欢
+
+
+ 璇存槑鏂囦欢
+
+
+ 璇存槑鏂囦欢
+
diff --git a/MCA/MCADoc.cpp b/MCA/MCADoc.cpp
index 88106ec..bf41ad0 100644
--- a/MCA/MCADoc.cpp
+++ b/MCA/MCADoc.cpp
@@ -4,6 +4,7 @@
#include "pch.h"
#include "framework.h"
+
// SHARED_HANDLERS 鍙互鍦ㄥ疄鐜伴瑙堛佺缉鐣ュ浘鍜屾悳绱㈢瓫閫夊櫒鍙ユ焺鐨
// ATL 椤圭洰涓繘琛屽畾涔夛紝骞跺厑璁镐笌璇ラ」鐩叡浜枃妗ｄ唬鐮併
#ifndef SHARED_HANDLERS
@@ -12,6 +13,10 @@
#include "MCADoc.h"
+#include
+#include
+#include
+#include
#include
#ifdef _DEBUG
@@ -27,14 +32,46 @@ END_MESSAGE_MAP()
// CMCADoc 鏋勯/鏋愭瀯
-
CMCADoc::CMCADoc() noexcept
{
+ FILE *stream_tmp;
+ int channel_id, channel_count;
+
+ srand((unsigned)time(NULL));
+
m_nChannelCount = new int[m_nChannelNum];
- for (int i = 0; i < m_nChannelNum; i++)
- {
- m_nChannelCount[i] = 0;
- }
+ for (int i = 0; i < m_nChannelNum; i++) m_nChannelCount[i] = 0;
+
+ freopen_s(&stream_tmp, "data/Co60.txt", "r", stdin);
+ for (int i = 0; i < 1024; i++)
+ {
+ scanf_s("%d,%d", &channel_id, &channel_count);
+ es_Co60[i] = channel_count;
+ if (i > 0) es_Co60[i] += es_Co60[i-1];
+ }
+ fclose(stdin);
+ freopen_s(&stream_tmp, "data/Cs137.txt", "r", stdin);
+ for (int i = 0; i < 1024; i++)
+ {
+ scanf_s("%d,%d", &channel_id, &channel_count);
+ es_Cs137[i] = channel_count;
+ if (i > 0) es_Cs137[i] += es_Cs137[i-1];
+ }
+ fclose(stdin);
+ freopen_s(&stream_tmp, "data/Na22.txt", "r", stdin);
+ for (int i = 0; i < 1024; i++)
+ {
+ scanf_s("%d,%d", &channel_id, &channel_count);
+ es_Na22[i] = channel_count;
+ if (i > 0) es_Na22[i] += es_Na22[i-1];
+ }
+ fclose(stdin);
+ for (int i = 0; i < 1024; i++)
+ {
+ es_Co60[i] /= es_Co60[1023];
+ es_Cs137[i] /= es_Cs137[1023];
+ es_Na22[i] /= es_Na22[1023];
+ }
}
CMCADoc::~CMCADoc()
@@ -52,11 +89,7 @@ BOOL CMCADoc::OnNewDocument()
return TRUE;
}
-
-
-
// CMCADoc 搴忓垪鍖
-
void CMCADoc::Serialize(CArchive& ar)
{
if (ar.IsStoring())
@@ -70,7 +103,6 @@ void CMCADoc::Serialize(CArchive& ar)
}
#ifdef SHARED_HANDLERS
-
// 缂╃暐鍥剧殑鏀寔
void CMCADoc::OnDrawThumbnail(CDC& dc, LPRECT lprcBounds)
{
@@ -124,7 +156,6 @@ void CMCADoc::SetSearchContent(const CString& value)
#endif // SHARED_HANDLERS
// CMCADoc 璇婃柇
-
#ifdef _DEBUG
void CMCADoc::AssertValid() const
{
@@ -139,3 +170,21 @@ void CMCADoc::Dump(CDumpContext& dc) const
// CMCADoc 鍛戒护
+double CMCADoc::uniform()
+{
+ int x = rand();
+ double y = (float)(x % 100) / 100;
+ return y;
+}
+
+void CMCADoc::random_peaks(std::string name)
+{
+ int K;
+ double eps = uniform();
+
+ if (name == "Co60") K = std::lower_bound(es_Co60, es_Co60 + 1024, eps) - es_Co60;
+ else if (name == "Cs137") K = std::lower_bound(es_Cs137, es_Cs137 + 1024, eps) - es_Cs137;
+ else K = std::lower_bound(es_Na22, es_Na22 + 1024, eps) - es_Na22;
+
+ m_nChannelCount[K] += 1;
+}
\ No newline at end of file
diff --git a/MCA/MCADoc.h b/MCA/MCADoc.h
index c2d5b8a..7f5f49b 100644
--- a/MCA/MCADoc.h
+++ b/MCA/MCADoc.h
@@ -5,6 +5,7 @@
#pragma once
+#include
class CMCADoc : public CDocument
{
@@ -14,16 +15,27 @@ protected: // 浠呬粠搴忓垪鍖栧垱寤
// 鐗规
public:
- int m_nChannelNum = 0;
+ int m_nChannelNum = 1024;
int *m_nChannelCount;
+private:
+ // reference spectrum
+ double es_Co60[1024] = {};
+ double es_Cs137[1024] = {};
+ double es_Na22[1024] = {};
+
// 鎿嶄綔
public:
+ void random_peaks(std::string name);
+
+private:
+ double uniform();
// 閲嶅啓
public:
virtual BOOL OnNewDocument();
virtual void Serialize(CArchive& ar);
+
#ifdef SHARED_HANDLERS
virtual void InitializeSearchContent();
virtual void OnDrawThumbnail(CDC& dc, LPRECT lprcBounds);
diff --git a/MCA/MainFrm.cpp b/MCA/MainFrm.cpp
index 5128c36..b06cbc2 100644
--- a/MCA/MainFrm.cpp
+++ b/MCA/MainFrm.cpp
@@ -79,7 +79,7 @@ BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT /*lpcs*/,
WS_CHILD | WS_VISIBLE, AFX_IDW_PANE_FIRST));
// 宸︿晶绐楀彛鍒涘缓瑙嗗浘锛岀0琛岀0鍒
VERIFY(m_wndSplitter.CreateView(0, 0,
- RUNTIME_CLASS(CControlView), CSize(240, 0), pContext));
+ RUNTIME_CLASS(CControlView), CSize(360, 0), pContext));
// 鍙充晶绐楀彛涓婁笅鎷嗗垎锛2琛1鍒
VERIFY(m_wndSplitter_2.CreateStatic(&m_wndSplitter, 2, 1,
WS_CHILD | WS_VISIBLE, m_wndSplitter.IdFromRowCol(0, 1)));
diff --git a/MCA/Resource.h b/MCA/Resource.h
index 6eba5d9..3190013 100644
--- a/MCA/Resource.h
+++ b/MCA/Resource.h
@@ -8,6 +8,9 @@
#define IDR_MCATYPE 130
#define IDD_DIALOG1 310
#define IDD_DIALOG_CONTROL 310
+#define IDC_TREE1 1010
+#define IDC_MFCSHELLTREE1 1013
+#define IDC_MFCMASKEDEDIT1 1015
#define ID_32786 32786
#define ID_32787 32787
#define ID_32788 32788
@@ -33,14 +36,18 @@
#define ID_BUTTON32809 32809
#define ID_BUTTON32810 32810
#define ID_BUTTON32811 32811
+#define ID_32812 32812
+#define ID_32813 32813
+#define ID_32814 32814
+#define ID_32815 32815
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 313
-#define _APS_NEXT_COMMAND_VALUE 32812
-#define _APS_NEXT_CONTROL_VALUE 1008
+#define _APS_NEXT_COMMAND_VALUE 32816
+#define _APS_NEXT_CONTROL_VALUE 1016
#define _APS_NEXT_SYMED_VALUE 310
#endif
#endif
diff --git a/MCA/data/Co60.txt b/MCA/data/Co60.txt
new file mode 100644
index 0000000..c5ff73f
--- /dev/null
+++ b/MCA/data/Co60.txt
@@ -0,0 +1,1024 @@
+0,5183
+1,5252
+2,5489
+3,5638
+4,5669
+5,5799
+6,5778
+7,5944
+8,5871
+9,6090
+10,6122
+11,6034
+12,6169
+13,6159
+14,6071
+15,6032
+16,6204
+17,6162
+18,6161
+19,5968
+20,6133
+21,6155
+22,6153
+23,6094
+24,6040
+25,6183
+26,6159
+27,6181
+28,6189
+29,6291
+30,6268
+31,6461
+32,6245
+33,6381
+34,6398
+35,6438
+36,6594
+37,6485
+38,6736
+39,6523
+40,6750
+41,6705
+42,6599
+43,6415
+44,6630
+45,6641
+46,6611
+47,6697
+48,6632
+49,6463
+50,6728
+51,6621
+52,6489
+53,6582
+54,6616
+55,6397
+56,6551
+57,6483
+58,6551
+59,6550
+60,6506
+61,6456
+62,6524
+63,6614
+64,6430
+65,6432
+66,6666
+67,6582
+68,6658
+69,6603
+70,6610
+71,6532
+72,6671
+73,6562
+74,6531
+75,6657
+76,6517
+77,6567
+78,6618
+79,6508
+80,6520
+81,6636
+82,6683
+83,6576
+84,6673
+85,6613
+86,6630
+87,6598
+88,6729
+89,6578
+90,6683
+91,6559
+92,6731
+93,6645
+94,6589
+95,6585
+96,6793
+97,6603
+98,6700
+99,6679
+100,6628
+101,6757
+102,6606
+103,6619
+104,6826
+105,6693
+106,6750
+107,6874
+108,6917
+109,6862
+110,7086
+111,7023
+112,7045
+113,7075
+114,7102
+115,7345
+116,7499
+117,7658
+118,7650
+119,7825
+120,7972
+121,8177
+122,8309
+123,8402
+124,8677
+125,8528
+126,8999
+127,9205
+128,9296
+129,9198
+130,9302
+131,9483
+132,9511
+133,9526
+134,9526
+135,9424
+136,9455
+137,9508
+138,9408
+139,9424
+140,9276
+141,9109
+142,9186
+143,8937
+144,8941
+145,8716
+146,8717
+147,8503
+148,8296
+149,8190
+150,8216
+151,8140
+152,8021
+153,8124
+154,8003
+155,7874
+156,7594
+157,7760
+158,7551
+159,7533
+160,7380
+161,7528
+162,7455
+163,7167
+164,7086
+165,7165
+166,7142
+167,6973
+168,6768
+169,6827
+170,6800
+171,6730
+172,6746
+173,6602
+174,6744
+175,6570
+176,6603
+177,6548
+178,6498
+179,6551
+180,6595
+181,6602
+182,6419
+183,6329
+184,6285
+185,6181
+186,6277
+187,6111
+188,6161
+189,6176
+190,6181
+191,6329
+192,6123
+193,6178
+194,6034
+195,5797
+196,5964
+197,5923
+198,5689
+199,5767
+200,5957
+201,5765
+202,5623
+203,5755
+204,5718
+205,5577
+206,5663
+207,5513
+208,5572
+209,5598
+210,5495
+211,5584
+212,5507
+213,5626
+214,5553
+215,5408
+216,5316
+217,5520
+218,5442
+219,5426
+220,5458
+221,5476
+222,5406
+223,5284
+224,5380
+225,5267
+226,5402
+227,5233
+228,5325
+229,5457
+230,5295
+231,5164
+232,5348
+233,5172
+234,5222
+235,5199
+236,5359
+237,5299
+238,5345
+239,5202
+240,5093
+241,5170
+242,5121
+243,5151
+244,5091
+245,5108
+246,5132
+247,5125
+248,5138
+249,5070
+250,5018
+251,5122
+252,5066
+253,5223
+254,5092
+255,4982
+256,5195
+257,5078
+258,5066
+259,5076
+260,5104
+261,5133
+262,5126
+263,5152
+264,5144
+265,5031
+266,4984
+267,4999
+268,5151
+269,5020
+270,4989
+271,5006
+272,5088
+273,4941
+274,5010
+275,5084
+276,5049
+277,4988
+278,5026
+279,5110
+280,5082
+281,5036
+282,4921
+283,5087
+284,4943
+285,5049
+286,4961
+287,4993
+288,5001
+289,5126
+290,5020
+291,4978
+292,5027
+293,4924
+294,5072
+295,5013
+296,4934
+297,4930
+298,4921
+299,4995
+300,5101
+301,4965
+302,4997
+303,4944
+304,4930
+305,5049
+306,4894
+307,5073
+308,4863
+309,4917
+310,4929
+311,4872
+312,4901
+313,4942
+314,4952
+315,4957
+316,5024
+317,5032
+318,4987
+319,4971
+320,4928
+321,5034
+322,4958
+323,5109
+324,5012
+325,5014
+326,5095
+327,5013
+328,4891
+329,4927
+330,5053
+331,5027
+332,4949
+333,5028
+334,4947
+335,4844
+336,4974
+337,5050
+338,4949
+339,5033
+340,4993
+341,4957
+342,5026
+343,5072
+344,5039
+345,4949
+346,5065
+347,5048
+348,4993
+349,5037
+350,4969
+351,4926
+352,4961
+353,4980
+354,4944
+355,5009
+356,4873
+357,5011
+358,4851
+359,4957
+360,4975
+361,4993
+362,5082
+363,5167
+364,5021
+365,4987
+366,5076
+367,4903
+368,4998
+369,5021
+370,5143
+371,5067
+372,5060
+373,4940
+374,4996
+375,5032
+376,5182
+377,5083
+378,5043
+379,5083
+380,5090
+381,5019
+382,4935
+383,5172
+384,5065
+385,5042
+386,5083
+387,5190
+388,5171
+389,5033
+390,5098
+391,5133
+392,5218
+393,5268
+394,5304
+395,5250
+396,5144
+397,5099
+398,5242
+399,5231
+400,5211
+401,5077
+402,5063
+403,5160
+404,5222
+405,5176
+406,5168
+407,5191
+408,5127
+409,5193
+410,5397
+411,5123
+412,5209
+413,5178
+414,5238
+415,5307
+416,5181
+417,5288
+418,5239
+419,5273
+420,5241
+421,5290
+422,5278
+423,5281
+424,5316
+425,5307
+426,5352
+427,5237
+428,5290
+429,5361
+430,5260
+431,5395
+432,5329
+433,5523
+434,5355
+435,5518
+436,5315
+437,5418
+438,5395
+439,5301
+440,5423
+441,5510
+442,5482
+443,5439
+444,5554
+445,5425
+446,5543
+447,5454
+448,5322
+449,5338
+450,5394
+451,5445
+452,5454
+453,5541
+454,5745
+455,5553
+456,5721
+457,5546
+458,5617
+459,5677
+460,5571
+461,5608
+462,5694
+463,5577
+464,5640
+465,5610
+466,5654
+467,5680
+468,5718
+469,5700
+470,5665
+471,5687
+472,5752
+473,5681
+474,5898
+475,5797
+476,5784
+477,5765
+478,5803
+479,5702
+480,5792
+481,5684
+482,5892
+483,5729
+484,6026
+485,5903
+486,5844
+487,5880
+488,5882
+489,5942
+490,5833
+491,5872
+492,6037
+493,6035
+494,5838
+495,5962
+496,5878
+497,5809
+498,5983
+499,6141
+500,5996
+501,5990
+502,6146
+503,6015
+504,6182
+505,6201
+506,6112
+507,6201
+508,6097
+509,6074
+510,6104
+511,6116
+512,6003
+513,6242
+514,6256
+515,5971
+516,6135
+517,6128
+518,6123
+519,6114
+520,6115
+521,6128
+522,6109
+523,6088
+524,6301
+525,6352
+526,6181
+527,6090
+528,6208
+529,6082
+530,6416
+531,6344
+532,6164
+533,6257
+534,6205
+535,6198
+536,6246
+537,6170
+538,6386
+539,6321
+540,6262
+541,6328
+542,6352
+543,6183
+544,6291
+545,6296
+546,6223
+547,6085
+548,6373
+549,6337
+550,6377
+551,6187
+552,6242
+553,6169
+554,6184
+555,6128
+556,6088
+557,6006
+558,6116
+559,6008
+560,5972
+561,5898
+562,5835
+563,5820
+564,5680
+565,5617
+566,5770
+567,5731
+568,5503
+569,5568
+570,5472
+571,5306
+572,5326
+573,5214
+574,5206
+575,5206
+576,5087
+577,4994
+578,4982
+579,4991
+580,4851
+581,4941
+582,4889
+583,4817
+584,4713
+585,4702
+586,4631
+587,4612
+588,4689
+589,4586
+590,4629
+591,4442
+592,4406
+593,4402
+594,4431
+595,4418
+596,4333
+597,4417
+598,4324
+599,4229
+600,4223
+601,4159
+602,4358
+603,4254
+604,4140
+605,4235
+606,4219
+607,4185
+608,4235
+609,4224
+610,4226
+611,4059
+612,4251
+613,4202
+614,4168
+615,4216
+616,4306
+617,4220
+618,4118
+619,4260
+620,4289
+621,4191
+622,4295
+623,4216
+624,4274
+625,4265
+626,4351
+627,4380
+628,4374
+629,4294
+630,4326
+631,4320
+632,4403
+633,4391
+634,4513
+635,4378
+636,4379
+637,4439
+638,4446
+639,4425
+640,4367
+641,4464
+642,4442
+643,4659
+644,4629
+645,4482
+646,4632
+647,4746
+648,4611
+649,4712
+650,4717
+651,4720
+652,4800
+653,4746
+654,4756
+655,4903
+656,4899
+657,4932
+658,5135
+659,5121
+660,5193
+661,5401
+662,5472
+663,5477
+664,5652
+665,5748
+666,5837
+667,5892
+668,6088
+669,6267
+670,6326
+671,6643
+672,6670
+673,6979
+674,7015
+675,7264
+676,7530
+677,7512
+678,7754
+679,7973
+680,8170
+681,8361
+682,8448
+683,8631
+684,8877
+685,9023
+686,9150
+687,9085
+688,9466
+689,9674
+690,9466
+691,9621
+692,9719
+693,9734
+694,9745
+695,9667
+696,9814
+697,9664
+698,9626
+699,9604
+700,9706
+701,9516
+702,9254
+703,9151
+704,9278
+705,8884
+706,8541
+707,8550
+708,8442
+709,8149
+710,7960
+711,7868
+712,7460
+713,7457
+714,6995
+715,7029
+716,6638
+717,6445
+718,6089
+719,5913
+720,5771
+721,5311
+722,5180
+723,4952
+724,4810
+725,4559
+726,4431
+727,4183
+728,4037
+729,3808
+730,3667
+731,3507
+732,3420
+733,3285
+734,3084
+735,3005
+736,2966
+737,2865
+738,2809
+739,2805
+740,2679
+741,2625
+742,2634
+743,2641
+744,2514
+745,2570
+746,2627
+747,2609
+748,2731
+749,2648
+750,2820
+751,2822
+752,2983
+753,2954
+754,3050
+755,3070
+756,3286
+757,3266
+758,3452
+759,3678
+760,3798
+761,3904
+762,3976
+763,4119
+764,4294
+765,4420
+766,4633
+767,4646
+768,4818
+769,5103
+770,5319
+771,5262
+772,5521
+773,5579
+774,5754
+775,5728
+776,6170
+777,6137
+778,6431
+779,6479
+780,6399
+781,6622
+782,6560
+783,6699
+784,6778
+785,6810
+786,6925
+787,6947
+788,6900
+789,6823
+790,7046
+791,6823
+792,6794
+793,6867
+794,6707
+795,6626
+796,6440
+797,6399
+798,6219
+799,6357
+800,6198
+801,6108
+802,5863
+803,5767
+804,5638
+805,5392
+806,5230
+807,5001
+808,4819
+809,4619
+810,4589
+811,4299
+812,4090
+813,3880
+814,3752
+815,3715
+816,3483
+817,3226
+818,3037
+819,2894
+820,2760
+821,2564
+822,2538
+823,2382
+824,2201
+825,2047
+826,1935
+827,1793
+828,1709
+829,1559
+830,1530
+831,1326
+832,1282
+833,1196
+834,1084
+835,1033
+836,947
+837,871
+838,893
+839,799
+840,678
+841,718
+842,624
+843,598
+844,600
+845,532
+846,487
+847,432
+848,424
+849,361
+850,389
+851,382
+852,339
+853,328
+854,341
+855,302
+856,294
+857,292
+858,310
+859,277
+860,243
+861,240
+862,258
+863,263
+864,244
+865,220
+866,235
+867,247
+868,228
+869,244
+870,194
+871,224
+872,216
+873,219
+874,208
+875,208
+876,209
+877,230
+878,231
+879,219
+880,191
+881,197
+882,201
+883,217
+884,211
+885,215
+886,222
+887,220
+888,218
+889,200
+890,212
+891,193
+892,213
+893,215
+894,208
+895,216
+896,205
+897,209
+898,193
+899,208
+900,183
+901,192
+902,170
+903,200
+904,201
+905,184
+906,209
+907,201
+908,197
+909,194
+910,193
+911,194
+912,195
+913,167
+914,198
+915,200
+916,173
+917,175
+918,178
+919,192
+920,188
+921,202
+922,171
+923,194
+924,182
+925,167
+926,198
+927,200
+928,202
+929,188
+930,189
+931,188
+932,201
+933,190
+934,219
+935,204
+936,178
+937,167
+938,175
+939,190
+940,182
+941,186
+942,178
+943,200
+944,172
+945,192
+946,188
+947,177
+948,195
+949,187
+950,151
+951,184
+952,197
+953,172
+954,185
+955,172
+956,176
+957,153
+958,157
+959,181
+960,162
+961,177
+962,188
+963,187
+964,181
+965,199
+966,184
+967,172
+968,187
+969,180
+970,160
+971,174
+972,155
+973,168
+974,174
+975,157
+976,184
+977,174
+978,180
+979,149
+980,169
+981,176
+982,178
+983,172
+984,157
+985,169
+986,167
+987,175
+988,183
+989,158
+990,208
+991,160
+992,142
+993,158
+994,184
+995,175
+996,169
+997,169
+998,159
+999,174
+1000,154
+1001,149
+1002,157
+1003,192
+1004,153
+1005,166
+1006,157
+1007,151
+1008,174
+1009,152
+1010,181
+1011,171
+1012,131
+1013,158
+1014,137
+1015,149
+1016,175
+1017,146
+1018,168
+1019,144
+1020,159
+1021,158
+1022,179
+1023,151
\ No newline at end of file
diff --git a/MCA/data/Cs137.txt b/MCA/data/Cs137.txt
new file mode 100644
index 0000000..2f329a3
--- /dev/null
+++ b/MCA/data/Cs137.txt
@@ -0,0 +1,1024 @@
+0,5641
+1,6895
+2,8066
+3,9662
+4,11618
+5,14000
+6,16475
+7,18677
+8,20564
+9,21553
+10,22059
+11,20376
+12,17945
+13,14522
+14,11231
+15,8643
+16,6583
+17,5113
+18,4179
+19,3721
+20,3528
+21,3490
+22,3268
+23,3271
+24,3361
+25,3220
+26,3325
+27,3214
+28,3211
+29,3250
+30,3283
+31,3373
+32,3361
+33,3334
+34,3359
+35,3275
+36,3456
+37,3291
+38,3272
+39,3227
+40,3213
+41,3159
+42,3180
+43,3142
+44,3187
+45,3217
+46,3184
+47,3183
+48,3090
+49,3121
+50,3186
+51,3184
+52,3211
+53,3239
+54,3103
+55,3170
+56,3119
+57,3171
+58,3071
+59,3089
+60,3130
+61,3234
+62,3179
+63,3283
+64,3170
+65,3131
+66,3179
+67,3143
+68,3151
+69,3243
+70,3226
+71,3276
+72,3065
+73,3095
+74,3173
+75,3280
+76,3184
+77,3229
+78,3080
+79,3097
+80,3200
+81,3294
+82,3218
+83,3307
+84,3352
+85,3213
+86,3421
+87,3439
+88,3377
+89,3326
+90,3382
+91,3427
+92,3496
+93,3457
+94,3489
+95,3685
+96,3566
+97,3751
+98,3816
+99,3780
+100,3807
+101,4069
+102,4165
+103,4168
+104,4309
+105,4345
+106,4442
+107,4597
+108,4734
+109,4874
+110,4765
+111,4956
+112,4832
+113,4950
+114,4892
+115,4965
+116,4781
+117,4859
+118,4825
+119,4834
+120,4715
+121,4661
+122,4640
+123,4613
+124,4486
+125,4588
+126,4466
+127,4319
+128,4206
+129,4195
+130,4210
+131,4202
+132,4209
+133,3978
+134,4013
+135,3958
+136,3896
+137,3813
+138,3847
+139,3817
+140,3651
+141,3568
+142,3694
+143,3572
+144,3536
+145,3562
+146,3434
+147,3454
+148,3350
+149,3309
+150,3278
+151,3221
+152,3147
+153,3271
+154,3298
+155,3231
+156,3217
+157,3145
+158,3152
+159,3005
+160,3159
+161,3015
+162,2990
+163,3111
+164,2923
+165,3001
+166,3015
+167,2995
+168,2956
+169,2963
+170,3053
+171,2939
+172,2855
+173,2927
+174,2887
+175,2964
+176,2914
+177,2924
+178,2821
+179,2772
+180,2789
+181,2846
+182,2764
+183,2838
+184,2847
+185,2792
+186,2842
+187,2785
+188,2723
+189,2759
+190,2722
+191,2770
+192,2811
+193,2869
+194,2846
+195,2782
+196,2802
+197,2718
+198,2773
+199,2676
+200,2805
+201,2819
+202,2790
+203,2751
+204,2743
+205,2726
+206,2808
+207,2777
+208,2808
+209,2739
+210,2797
+211,2804
+212,2690
+213,2742
+214,2841
+215,2763
+216,2667
+217,2710
+218,2727
+219,2669
+220,2685
+221,2722
+222,2725
+223,2710
+224,2802
+225,2829
+226,2741
+227,2755
+228,2766
+229,2717
+230,2756
+231,2706
+232,2802
+233,2805
+234,2628
+235,2740
+236,2792
+237,2695
+238,2772
+239,2772
+240,2792
+241,2809
+242,2785
+243,2783
+244,2767
+245,2795
+246,2772
+247,2797
+248,2788
+249,2861
+250,2848
+251,2847
+252,2821
+253,2831
+254,2880
+255,2860
+256,2856
+257,2831
+258,2934
+259,2860
+260,2816
+261,2792
+262,2926
+263,2843
+264,2813
+265,2848
+266,2857
+267,2816
+268,2741
+269,2795
+270,2661
+271,2681
+272,2584
+273,2625
+274,2522
+275,2539
+276,2372
+277,2251
+278,2225
+279,2312
+280,2238
+281,2100
+282,2021
+283,1979
+284,1920
+285,1887
+286,1787
+287,1688
+288,1630
+289,1524
+290,1435
+291,1394
+292,1338
+293,1288
+294,1228
+295,1148
+296,1048
+297,1039
+298,973
+299,933
+300,948
+301,929
+302,869
+303,804
+304,777
+305,682
+306,725
+307,721
+308,667
+309,691
+310,628
+311,593
+312,574
+313,628
+314,563
+315,537
+316,580
+317,566
+318,544
+319,502
+320,570
+321,541
+322,490
+323,527
+324,514
+325,578
+326,568
+327,534
+328,589
+329,593
+330,583
+331,586
+332,626
+333,592
+334,625
+335,671
+336,637
+337,734
+338,650
+339,722
+340,774
+341,770
+342,800
+343,854
+344,931
+345,900
+346,946
+347,994
+348,1065
+349,1093
+350,1111
+351,1123
+352,1173
+353,1270
+354,1404
+355,1350
+356,1433
+357,1479
+358,1612
+359,1640
+360,1715
+361,1798
+362,1924
+363,1970
+364,2117
+365,2228
+366,2276
+367,2417
+368,2679
+369,2787
+370,2977
+371,3165
+372,3325
+373,3573
+374,3958
+375,4196
+376,4432
+377,4635
+378,5039
+379,5352
+380,5849
+381,6224
+382,6375
+383,6875
+384,7230
+385,7879
+386,8267
+387,8593
+388,9061
+389,9506
+390,10054
+391,10135
+392,10409
+393,10920
+394,11128
+395,11547
+396,11496
+397,11805
+398,12078
+399,11959
+400,12161
+401,11885
+402,11985
+403,11921
+404,11808
+405,11587
+406,11249
+407,10907
+408,10807
+409,10172
+410,9775
+411,9314
+412,8852
+413,8424
+414,7938
+415,7473
+416,6946
+417,6456
+418,5894
+419,5462
+420,4929
+421,4627
+422,4111
+423,3705
+424,3348
+425,2972
+426,2790
+427,2392
+428,2060
+429,1824
+430,1634
+431,1456
+432,1274
+433,1085
+434,928
+435,795
+436,699
+437,632
+438,521
+439,427
+440,398
+441,331
+442,310
+443,267
+444,229
+445,188
+446,178
+447,157
+448,145
+449,128
+450,126
+451,106
+452,116
+453,100
+454,109
+455,94
+456,89
+457,95
+458,68
+459,87
+460,86
+461,85
+462,90
+463,68
+464,74
+465,92
+466,84
+467,86
+468,76
+469,86
+470,79
+471,73
+472,79
+473,62
+474,84
+475,71
+476,79
+477,94
+478,69
+479,62
+480,73
+481,76
+482,83
+483,75
+484,73
+485,86
+486,79
+487,64
+488,73
+489,75
+490,54
+491,66
+492,87
+493,71
+494,83
+495,75
+496,86
+497,65
+498,73
+499,78
+500,71
+501,80
+502,66
+503,71
+504,67
+505,68
+506,61
+507,55
+508,71
+509,63
+510,74
+511,74
+512,65
+513,53
+514,63
+515,78
+516,55
+517,54
+518,61
+519,59
+520,79
+521,76
+522,63
+523,69
+524,58
+525,66
+526,43
+527,71
+528,47
+529,62
+530,56
+531,50
+532,58
+533,66
+534,55
+535,69
+536,71
+537,58
+538,46
+539,53
+540,53
+541,58
+542,56
+543,56
+544,61
+545,42
+546,47
+547,60
+548,70
+549,47
+550,57
+551,62
+552,40
+553,48
+554,51
+555,41
+556,42
+557,55
+558,55
+559,45
+560,63
+561,43
+562,44
+563,42
+564,52
+565,53
+566,39
+567,38
+568,35
+569,46
+570,53
+571,55
+572,48
+573,39
+574,45
+575,38
+576,50
+577,44
+578,41
+579,44
+580,37
+581,34
+582,35
+583,31
+584,44
+585,37
+586,36
+587,43
+588,25
+589,37
+590,36
+591,34
+592,48
+593,34
+594,37
+595,37
+596,30
+597,27
+598,42
+599,33
+600,37
+601,39
+602,36
+603,32
+604,36
+605,30
+606,30
+607,41
+608,37
+609,36
+610,38
+611,31
+612,41
+613,33
+614,35
+615,46
+616,35
+617,47
+618,26
+619,25
+620,35
+621,33
+622,32
+623,47
+624,26
+625,29
+626,33
+627,38
+628,40
+629,31
+630,39
+631,39
+632,36
+633,31
+634,41
+635,32
+636,39
+637,43
+638,31
+639,34
+640,37
+641,50
+642,31
+643,34
+644,42
+645,35
+646,32
+647,42
+648,34
+649,33
+650,29
+651,34
+652,27
+653,36
+654,30
+655,19
+656,34
+657,21
+658,23
+659,32
+660,31
+661,34
+662,34
+663,32
+664,34
+665,34
+666,35
+667,38
+668,24
+669,32
+670,32
+671,23
+672,29
+673,22
+674,37
+675,34
+676,31
+677,19
+678,29
+679,26
+680,28
+681,27
+682,32
+683,26
+684,30
+685,24
+686,19
+687,26
+688,25
+689,27
+690,22
+691,19
+692,18
+693,24
+694,21
+695,21
+696,29
+697,17
+698,30
+699,22
+700,26
+701,21
+702,18
+703,16
+704,20
+705,15
+706,24
+707,30
+708,20
+709,9
+710,21
+711,21
+712,18
+713,23
+714,19
+715,17
+716,30
+717,29
+718,20
+719,19
+720,24
+721,28
+722,25
+723,19
+724,22
+725,23
+726,27
+727,23
+728,17
+729,30
+730,16
+731,27
+732,15
+733,12
+734,21
+735,17
+736,21
+737,16
+738,22
+739,14
+740,20
+741,32
+742,23
+743,16
+744,21
+745,27
+746,27
+747,19
+748,21
+749,22
+750,17
+751,13
+752,20
+753,22
+754,24
+755,24
+756,27
+757,22
+758,31
+759,22
+760,21
+761,17
+762,10
+763,13
+764,21
+765,23
+766,25
+767,19
+768,16
+769,11
+770,19
+771,23
+772,21
+773,20
+774,19
+775,10
+776,22
+777,24
+778,26
+779,28
+780,20
+781,21
+782,22
+783,26
+784,22
+785,18
+786,29
+787,22
+788,23
+789,21
+790,13
+791,27
+792,22
+793,22
+794,18
+795,22
+796,32
+797,19
+798,18
+799,20
+800,15
+801,20
+802,16
+803,23
+804,20
+805,18
+806,18
+807,17
+808,14
+809,23
+810,19
+811,20
+812,18
+813,10
+814,21
+815,15
+816,15
+817,12
+818,22
+819,17
+820,9
+821,13
+822,15
+823,11
+824,10
+825,12
+826,15
+827,6
+828,9
+829,6
+830,5
+831,10
+832,13
+833,10
+834,6
+835,9
+836,6
+837,7
+838,10
+839,7
+840,3
+841,7
+842,1
+843,6
+844,6
+845,1
+846,4
+847,6
+848,4
+849,4
+850,3
+851,2
+852,3
+853,4
+854,2
+855,1
+856,1
+857,5
+858,1
+859,2
+860,1
+861,0
+862,5
+863,2
+864,0
+865,2
+866,0
+867,0
+868,2
+869,2
+870,2
+871,3
+872,2
+873,0
+874,1
+875,0
+876,0
+877,1
+878,3
+879,0
+880,1
+881,2
+882,1
+883,1
+884,1
+885,3
+886,0
+887,1
+888,0
+889,0
+890,0
+891,1
+892,1
+893,1
+894,1
+895,2
+896,0
+897,0
+898,0
+899,0
+900,0
+901,0
+902,3
+903,0
+904,1
+905,0
+906,1
+907,0
+908,1
+909,1
+910,2
+911,0
+912,1
+913,2
+914,0
+915,1
+916,0
+917,0
+918,0
+919,1
+920,1
+921,0
+922,1
+923,0
+924,1
+925,1
+926,1
+927,0
+928,0
+929,3
+930,0
+931,0
+932,0
+933,0
+934,0
+935,1
+936,1
+937,0
+938,0
+939,1
+940,1
+941,1
+942,2
+943,0
+944,0
+945,0
+946,0
+947,1
+948,0
+949,0
+950,0
+951,0
+952,0
+953,0
+954,0
+955,0
+956,0
+957,0
+958,1
+959,0
+960,0
+961,1
+962,0
+963,0
+964,0
+965,0
+966,0
+967,0
+968,0
+969,0
+970,1
+971,0
+972,0
+973,1
+974,0
+975,0
+976,0
+977,1
+978,0
+979,0
+980,0
+981,3
+982,0
+983,0
+984,0
+985,0
+986,0
+987,0
+988,0
+989,0
+990,0
+991,0
+992,0
+993,0
+994,1
+995,0
+996,0
+997,0
+998,0
+999,0
+1000,0
+1001,0
+1002,1
+1003,0
+1004,0
+1005,0
+1006,0
+1007,1
+1008,2
+1009,1
+1010,0
+1011,0
+1012,1
+1013,0
+1014,0
+1015,0
+1016,0
+1017,0
+1018,0
+1019,1
+1020,0
+1021,0
+1022,1
+1023,0
\ No newline at end of file
diff --git a/MCA/data/Na22.txt b/MCA/data/Na22.txt
new file mode 100644
index 0000000..13d0c99
--- /dev/null
+++ b/MCA/data/Na22.txt
@@ -0,0 +1,1024 @@
+0,2098
+1,2195
+2,2145
+3,2224
+4,2210
+5,2265
+6,2352
+7,2344
+8,2456
+9,2434
+10,2473
+11,2491
+12,2556
+13,2595
+14,2539
+15,2690
+16,2609
+17,2611
+18,2505
+19,2651
+20,2575
+21,2569
+22,2639
+23,2607
+24,2686
+25,2650
+26,2715
+27,2695
+28,2689
+29,2771
+30,2850
+31,2871
+32,2909
+33,2880
+34,2934
+35,3093
+36,3141
+37,3111
+38,3181
+39,3222
+40,3274
+41,3316
+42,3281
+43,3375
+44,3504
+45,3431
+46,3508
+47,3471
+48,3572
+49,3418
+50,3545
+51,3497
+52,3461
+53,3407
+54,3488
+55,3475
+56,3386
+57,3363
+58,3281
+59,3327
+60,3334
+61,3293
+62,3412
+63,3319
+64,3315
+65,3363
+66,3412
+67,3236
+68,3283
+69,3430
+70,3357
+71,3205
+72,3286
+73,3353
+74,3424
+75,3399
+76,3212
+77,3162
+78,3386
+79,3284
+80,3356
+81,3268
+82,3333
+83,3247
+84,3234
+85,3219
+86,3159
+87,3277
+88,3171
+89,3194
+90,3146
+91,3137
+92,3144
+93,3159
+94,3158
+95,3170
+96,3327
+97,3134
+98,3177
+99,3163
+100,3329
+101,3289
+102,3265
+103,3428
+104,3440
+105,3447
+106,3401
+107,3615
+108,3613
+109,3553
+110,3732
+111,3785
+112,3728
+113,3771
+114,3805
+115,3641
+116,3679
+117,3706
+118,3557
+119,3619
+120,3454
+121,3582
+122,3566
+123,3463
+124,3463
+125,3459
+126,3387
+127,3338
+128,3248
+129,3320
+130,3302
+131,3237
+132,3198
+133,3369
+134,3190
+135,3270
+136,3106
+137,3143
+138,3129
+139,3070
+140,3075
+141,2995
+142,3024
+143,3116
+144,2951
+145,2805
+146,2872
+147,2888
+148,2914
+149,2884
+150,2827
+151,2799
+152,2707
+153,2706
+154,2775
+155,2694
+156,2720
+157,2683
+158,2703
+159,2595
+160,2662
+161,2497
+162,2606
+163,2523
+164,2628
+165,2541
+166,2458
+167,2450
+168,2360
+169,2381
+170,2396
+171,2423
+172,2358
+173,2398
+174,2343
+175,2366
+176,2319
+177,2377
+178,2330
+179,2320
+180,2331
+181,2361
+182,2242
+183,2360
+184,2300
+185,2242
+186,2207
+187,2235
+188,2243
+189,2308
+190,2295
+191,2256
+192,2295
+193,2329
+194,2256
+195,2204
+196,2186
+197,2065
+198,2178
+199,2143
+200,2101
+201,2056
+202,2028
+203,1965
+204,1913
+205,1885
+206,1863
+207,1838
+208,1821
+209,1742
+210,1699
+211,1607
+212,1571
+213,1532
+214,1470
+215,1475
+216,1308
+217,1356
+218,1275
+219,1210
+220,1231
+221,1223
+222,1166
+223,1101
+224,1121
+225,1144
+226,983
+227,1041
+228,1028
+229,959
+230,1009
+231,939
+232,908
+233,909
+234,892
+235,911
+236,899
+237,828
+238,821
+239,860
+240,861
+241,833
+242,821
+243,839
+244,797
+245,864
+246,805
+247,794
+248,752
+249,779
+250,797
+251,769
+252,813
+253,784
+254,845
+255,834
+256,827
+257,827
+258,811
+259,794
+260,858
+261,826
+262,880
+263,900
+264,841
+265,889
+266,900
+267,976
+268,953
+269,918
+270,990
+271,1053
+272,1052
+273,1075
+274,1107
+275,1096
+276,1150
+277,1186
+278,1302
+279,1311
+280,1315
+281,1363
+282,1399
+283,1414
+284,1492
+285,1530
+286,1640
+287,1761
+288,1822
+289,1869
+290,2030
+291,2143
+292,2276
+293,2412
+294,2589
+295,2940
+296,3137
+297,3383
+298,3637
+299,3902
+300,4151
+301,4411
+302,4838
+303,5149
+304,5777
+305,5964
+306,6595
+307,6970
+308,7387
+309,7536
+310,8036
+311,8240
+312,8691
+313,8957
+314,9338
+315,9086
+316,9650
+317,9767
+318,9811
+319,9912
+320,9709
+321,9578
+322,9413
+323,9318
+324,8845
+325,8852
+326,8312
+327,7880
+328,7274
+329,7103
+330,6638
+331,6047
+332,5620
+333,5160
+334,4786
+335,4316
+336,3967
+337,3441
+338,3073
+339,2764
+340,2453
+341,2180
+342,1999
+343,1712
+344,1552
+345,1367
+346,1199
+347,1065
+348,948
+349,831
+350,757
+351,696
+352,696
+353,561
+354,584
+355,548
+356,520
+357,477
+358,486
+359,473
+360,461
+361,465
+362,438
+363,413
+364,458
+365,414
+366,445
+367,428
+368,444
+369,420
+370,416
+371,448
+372,429
+373,461
+374,454
+375,435
+376,429
+377,400
+378,444
+379,413
+380,413
+381,432
+382,406
+383,381
+384,413
+385,420
+386,413
+387,425
+388,415
+389,448
+390,390
+391,412
+392,412
+393,400
+394,417
+395,408
+396,427
+397,450
+398,446
+399,399
+400,416
+401,441
+402,435
+403,440
+404,454
+405,436
+406,415
+407,442
+408,397
+409,438
+410,421
+411,415
+412,446
+413,433
+414,430
+415,428
+416,429
+417,422
+418,442
+419,377
+420,440
+421,441
+422,434
+423,471
+424,398
+425,478
+426,417
+427,450
+428,465
+429,466
+430,433
+431,489
+432,460
+433,469
+434,423
+435,436
+436,466
+437,488
+438,474
+439,458
+440,496
+441,416
+442,450
+443,488
+444,480
+445,427
+446,466
+447,431
+448,480
+449,470
+450,473
+451,428
+452,463
+453,440
+454,438
+455,460
+456,432
+457,442
+458,426
+459,431
+460,457
+461,464
+462,422
+463,479
+464,446
+465,447
+466,417
+467,427
+468,425
+469,484
+470,416
+471,423
+472,427
+473,429
+474,417
+475,416
+476,394
+477,412
+478,416
+479,421
+480,415
+481,420
+482,434
+483,417
+484,422
+485,446
+486,428
+487,400
+488,397
+489,427
+490,355
+491,397
+492,410
+493,420
+494,425
+495,400
+496,385
+497,438
+498,432
+499,412
+500,421
+501,393
+502,384
+503,369
+504,432
+505,402
+506,383
+507,432
+508,386
+509,384
+510,410
+511,396
+512,422
+513,392
+514,408
+515,407
+516,436
+517,377
+518,447
+519,383
+520,390
+521,400
+522,380
+523,389
+524,391
+525,399
+526,369
+527,400
+528,414
+529,413
+530,405
+531,383
+532,370
+533,391
+534,422
+535,381
+536,400
+537,424
+538,399
+539,376
+540,420
+541,411
+542,428
+543,414
+544,404
+545,378
+546,398
+547,428
+548,446
+549,432
+550,418
+551,431
+552,411
+553,374
+554,433
+555,418
+556,403
+557,397
+558,394
+559,391
+560,387
+561,391
+562,400
+563,396
+564,411
+565,430
+566,463
+567,406
+568,437
+569,428
+570,398
+571,444
+572,420
+573,392
+574,445
+575,438
+576,411
+577,392
+578,393
+579,385
+580,461
+581,422
+582,422
+583,416
+584,399
+585,428
+586,390
+587,402
+588,417
+589,410
+590,424
+591,412
+592,434
+593,416
+594,413
+595,409
+596,426
+597,439
+598,410
+599,411
+600,464
+601,412
+602,364
+603,416
+604,457
+605,403
+606,438
+607,422
+608,439
+609,426
+610,425
+611,389
+612,449
+613,446
+614,460
+615,450
+616,385
+617,466
+618,417
+619,421
+620,433
+621,402
+622,413
+623,407
+624,417
+625,435
+626,388
+627,383
+628,427
+629,390
+630,408
+631,385
+632,358
+633,417
+634,391
+635,407
+636,346
+637,382
+638,358
+639,381
+640,355
+641,358
+642,396
+643,340
+644,379
+645,316
+646,326
+647,332
+648,318
+649,336
+650,317
+651,311
+652,321
+653,308
+654,299
+655,268
+656,268
+657,320
+658,283
+659,245
+660,276
+661,262
+662,270
+663,269
+664,264
+665,261
+666,263
+667,240
+668,248
+669,202
+670,232
+671,221
+672,238
+673,203
+674,237
+675,226
+676,229
+677,205
+678,208
+679,181
+680,207
+681,208
+682,208
+683,245
+684,215
+685,188
+686,191
+687,204
+688,215
+689,203
+690,208
+691,183
+692,202
+693,214
+694,219
+695,213
+696,180
+697,193
+698,182
+699,202
+700,203
+701,206
+702,215
+703,197
+704,192
+705,185
+706,211
+707,201
+708,208
+709,216
+710,215
+711,219
+712,212
+713,226
+714,207
+715,218
+716,200
+717,210
+718,252
+719,224
+720,229
+721,253
+722,235
+723,246
+724,231
+725,239
+726,237
+727,262
+728,263
+729,276
+730,279
+731,263
+732,309
+733,284
+734,297
+735,307
+736,297
+737,353
+738,326
+739,299
+740,406
+741,371
+742,339
+743,396
+744,403
+745,432
+746,417
+747,462
+748,486
+749,446
+750,484
+751,551
+752,510
+753,571
+754,535
+755,543
+756,614
+757,610
+758,672
+759,677
+760,687
+761,717
+762,699
+763,739
+764,731
+765,754
+766,771
+767,856
+768,808
+769,826
+770,812
+771,797
+772,854
+773,816
+774,853
+775,812
+776,840
+777,838
+778,824
+779,781
+780,796
+781,827
+782,823
+783,887
+784,812
+785,814
+786,753
+787,733
+788,770
+789,709
+790,745
+791,671
+792,646
+793,688
+794,654
+795,603
+796,636
+797,599
+798,563
+799,583
+800,559
+801,521
+802,457
+803,449
+804,469
+805,428
+806,369
+807,372
+808,340
+809,331
+810,336
+811,329
+812,309
+813,322
+814,280
+815,263
+816,259
+817,273
+818,213
+819,234
+820,198
+821,180
+822,197
+823,184
+824,180
+825,160
+826,166
+827,157
+828,133
+829,145
+830,155
+831,146
+832,120
+833,145
+834,126
+835,139
+836,131
+837,126
+838,109
+839,136
+840,130
+841,105
+842,111
+843,129
+844,116
+845,110
+846,122
+847,115
+848,113
+849,99
+850,126
+851,115
+852,101
+853,118
+854,88
+855,104
+856,91
+857,118
+858,83
+859,110
+860,135
+861,116
+862,123
+863,112
+864,104
+865,108
+866,112
+867,108
+868,98
+869,120
+870,121
+871,120
+872,130
+873,101
+874,122
+875,112
+876,102
+877,111
+878,109
+879,87
+880,96
+881,106
+882,119
+883,114
+884,130
+885,102
+886,98
+887,103
+888,110
+889,106
+890,107
+891,106
+892,112
+893,100
+894,86
+895,105
+896,92
+897,96
+898,125
+899,95
+900,93
+901,103
+902,97
+903,103
+904,103
+905,100
+906,88
+907,95
+908,99
+909,79
+910,86
+911,85
+912,108
+913,104
+914,94
+915,105
+916,100
+917,104
+918,104
+919,90
+920,92
+921,115
+922,86
+923,90
+924,93
+925,74
+926,91
+927,103
+928,75
+929,102
+930,107
+931,92
+932,83
+933,102
+934,93
+935,114
+936,85
+937,93
+938,80
+939,74
+940,101
+941,87
+942,93
+943,78
+944,82
+945,102
+946,90
+947,78
+948,80
+949,74
+950,68
+951,84
+952,75
+953,83
+954,77
+955,62
+956,66
+957,66
+958,70
+959,65
+960,84
+961,67
+962,72
+963,67
+964,81
+965,59
+966,82
+967,64
+968,69
+969,56
+970,64
+971,74
+972,57
+973,55
+974,66
+975,49
+976,72
+977,47
+978,48
+979,54
+980,66
+981,50
+982,51
+983,52
+984,37
+985,46
+986,57
+987,44
+988,52
+989,49
+990,40
+991,44
+992,41
+993,47
+994,31
+995,38
+996,45
+997,43
+998,36
+999,40
+1000,43
+1001,41
+1002,32
+1003,35
+1004,42
+1005,23
+1006,35
+1007,33
+1008,28
+1009,43
+1010,23
+1011,33
+1012,42
+1013,32
+1014,51
+1015,28
+1016,21
+1017,28
+1018,22
+1019,25
+1020,28
+1021,32
+1022,21
+1023,41
\ No newline at end of file
diff --git a/MCA/res/Toolbar.bmp b/MCA/res/Toolbar.bmp
index 4f99b9d..45784c7 100644
Binary files a/MCA/res/Toolbar.bmp and b/MCA/res/Toolbar.bmp differ
diff --git a/README.md b/README.md
index 3993019..1078088 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-Multichannel Analyzer
\ No newline at end of file
+# Multichannel Analyzer
\ No newline at end of file
diff --git a/UML/Class.vsdx b/UML/Class.vsdx
deleted file mode 100644
index 4c2cb73..0000000
Binary files a/UML/Class.vsdx and /dev/null differ