Version 1.5.2 - Fix for Main file to call different runs
This commit is contained in:
		
							parent
							
								
									21f6937da6
								
							
						
					
					
						commit
						ea536da54d
					
				
							
								
								
									
										36
									
								
								BM1D.cc
								
								
								
								
							
							
						
						
									
										36
									
								
								BM1D.cc
								
								
								
								
							| 
						 | 
					@ -7,30 +7,30 @@ using namespace std;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int main(int argc, char* argv[])
 | 
					int main(int argc, char* argv[])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    Int_t nSteps, nRuns, p0,p1,p2,p3;
 | 
					    Int_t nSteps, nRuns, x0,x1,x2,x3;
 | 
				
			||||||
    Double_t mu1, mu2, sigma1, sigma2;
 | 
					    Double_t mu1, mu2, sigma1, sigma2;
 | 
				
			||||||
    string fileName="input.root";
 | 
					    string fileName="input.root";
 | 
				
			||||||
    string random_type="u";
 | 
					    char random_type='u';
 | 
				
			||||||
    Int_t vis, typeOfRun;
 | 
					    Int_t vis, typeOfRun;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    nSteps=nRuns=p0=p1=p2=p3=vis=typeOfRun=0;
 | 
					    nSteps=nRuns=x0=x1=x2=x3=vis=typeOfRun=0;
 | 
				
			||||||
    mu1=mu2=sigma1=sigma2=0.0;
 | 
					    mu1=mu2=sigma1=sigma2=0.0;
 | 
				
			||||||
    if(argc==15)
 | 
					    if(argc==15)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        nSteps=atoi(argv[1]);
 | 
					        nSteps=atoi(argv[1]);
 | 
				
			||||||
        nRuns=atoi(argv[2]);
 | 
					        nRuns=atoi(argv[2]);
 | 
				
			||||||
        p0=atoi(argv[3]);
 | 
					        x0=atoi(argv[3]);
 | 
				
			||||||
        p1=atoi(argv[4]);
 | 
					        x1=atoi(argv[4]);
 | 
				
			||||||
        p2=atoi(argv[5]);
 | 
					        x2=atoi(argv[5]);
 | 
				
			||||||
        p3=atoi(argv[6]);
 | 
					        x3=atoi(argv[6]);
 | 
				
			||||||
        mu1=atof(argv[7]);
 | 
					        mu1=atof(argv[7]);
 | 
				
			||||||
        mu2=atof(argv[8]);
 | 
					        mu2=atof(argv[8]);
 | 
				
			||||||
        sigma1=atof(argv[9]);
 | 
					        sigma1=atof(argv[9]);
 | 
				
			||||||
        sigma2=atof(argv[10]);
 | 
					        sigma2=atof(argv[10]);
 | 
				
			||||||
        fileName=argv[11];
 | 
					        fileName=argv[11];
 | 
				
			||||||
        random_type=argv[12];
 | 
					        random_type=argv[13][0];
 | 
				
			||||||
        vis=atoi(argv[1]); if((vis!=0)||(vis!=1)){vis=0;}
 | 
					        vis=atoi(argv[14]); if((vis!=0)||(vis!=1)){vis=0;}
 | 
				
			||||||
        typeOfRun=atoi(argv[2]); if((typeOfRun!=0)||(typeOfRun!=1)||(typeOfRun!=2)){typeOfRun=0;}
 | 
					        typeOfRun=atoi(argv[15]); if((typeOfRun!=0)||(typeOfRun!=1)||(typeOfRun!=2)){typeOfRun=0;}
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
| 
						 | 
					@ -42,7 +42,21 @@ int main(int argc, char* argv[])
 | 
				
			||||||
  Int_t n = 1000;
 | 
					  Int_t n = 1000;
 | 
				
			||||||
  BM1DProcess *myBM1DProcess = new BM1DProcess(n);
 | 
					  BM1DProcess *myBM1DProcess = new BM1DProcess(n);
 | 
				
			||||||
  myBM1DProcess->Init();
 | 
					  myBM1DProcess->Init();
 | 
				
			||||||
  myBM1DProcess->Run();
 | 
					    switch(random_type){
 | 
				
			||||||
 | 
					        case 'u':
 | 
				
			||||||
 | 
					            myBM1DProcess->Run(nRuns, nSteps, x0, x1);
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case 'g':
 | 
				
			||||||
 | 
					            myBM1DProcess->Run(nRuns, nSteps, x0, mu1, sigma1);
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case 'l':
 | 
				
			||||||
 | 
					            myBM1DProcess->Run(nRuns, nSteps, x0, x1, x2, mu1, sigma1, mu2, sigma2);
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        default:
 | 
				
			||||||
 | 
					            cout<<"ERROR! Wrong parameter for type of random generator! \n No run!"<<endl;
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Plotter* myPlotter = new Plotter();
 | 
					  Plotter* myPlotter = new Plotter();
 | 
				
			||||||
  myPlotter->Plot(n, myBM1DProcess->GetT(), myBM1DProcess->GetX());
 | 
					  myPlotter->Plot(n, myBM1DProcess->GetT(), myBM1DProcess->GetX());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue