X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=SingleModel.h;h=49c103b956b9fa389edac2ad4a4cefcce000a2cc;hb=0745215b9a29658a36c8c040e8afada43b9137bb;hp=532f79cd2c126c79199b1072508642394e083445;hpb=1794b68d34625b39404d5aba9e72646805b710ce;p=rsem.git

diff --git a/SingleModel.h b/SingleModel.h
index 532f79c..49c103b 100644
--- a/SingleModel.h
+++ b/SingleModel.h
@@ -61,7 +61,6 @@ public:
 		mw = NULL;
 
 		if (isMaster) {
-			ori = new Orientation(params.probF);
 			gld = new LenDist(params.minL, params.maxL);
 			if (mean >= EPSILON) {
 				mld = new LenDist(params.mate_minL, params.mate_maxL);
@@ -69,6 +68,7 @@ public:
 			if (!estRSPD) { rspd = new RSPD(estRSPD); }
 		}
 
+		ori = new Orientation(params.probF);
 		if (estRSPD) { rspd = new RSPD(estRSPD, params.B); }
 		pro = new Profile(params.maxL);
 		npro = new NoiseProfile();
@@ -315,6 +315,7 @@ void SingleModel::collect(const SingleModel& o) {
 	npro->collect(*(o.npro));
 }
 
+//Only master node can call
 void SingleModel::read(const char* inpF) {
 	int val;
 	FILE *fi = fopen(inpF, "r");
@@ -334,14 +335,18 @@ void SingleModel::read(const char* inpF) {
 	pro->read(fi);
 	npro->read(fi);
 
-	if (fscanf(fi, "%d", &M) == 1) {
-	  mw = new double[M + 1];
-	  for (int i = 0; i <= M; i++) fscanf(fi, "%lf", &mw[i]);
+	if (fscanf(fi, "%d", &val) == 1) {
+		if (M == 0) M = val;
+		if (M == val) {
+			mw = new double[M + 1];
+			for (int i = 0; i <= M; i++) fscanf(fi, "%lf", &mw[i]);
+		}
 	}
 
 	fclose(fi);
 }
 
+//Only master node can call. Only be called at EM.cpp
 void SingleModel::write(const char* outF) {
 	FILE *fo = fopen(outF, "w");