diff --git a/Software/IVScan/IVScan.C b/Software/IVScan/IVScan.C index c75f2fe..028a475 100644 --- a/Software/IVScan/IVScan.C +++ b/Software/IVScan/IVScan.C @@ -43,7 +43,26 @@ { cout << "**************************************************" << endl; - cout << "Some comments." << endl; + cout << "IVScan reads two text files (containing the bias voltage and the current values) and creates a ROOT file with the following information:" << endl; + cout << "- current as a function of the bias voltage." << endl; + + cout << "Compile with:" << endl; + + cout << "make" << endl; + + cout << "Run with:" << endl; + + cout << "./IVScan [input text file 1] [input text file 2] [additional folder]" << endl; + + cout << "where" << endl; + + cout << "- [input text file 1] is the complete path, including the folder and the filename, of the text file one wants to process (increasing bias voltage);" << endl; + cout << "- [input text file 2] is the complete path, including the folder and the filename, of the text file one wants to process (decreasing bias voltage);" << endl; + cout << "- [additional folder] is the optional additional folder where the output will be saved." << endl; + + cout << "A folder named AnalysisResults will be created in a fixed location and a ROOT file will be saved in there. A folder named Figures will be created inside the folder named AnalysisResults, with some monitoring plots." << endl; + + cout << "If needed, an additional folder can be specified, that will be created inside the folder named AnalysisResults." << endl; cout << "**************************************************" << endl; @@ -253,12 +272,12 @@ */ // Do some fanciness to get the directory right. - string analysis = "/home/hep/flionett/TestStand/AnalysisResults"; + string analysis = "/disk/groups/hep/flionett/TestStand/AnalysisResults"; if (externalPath!=0) analysis = string(analysis+"/"+externalPath); string filename_as_string_no_path = filename1_as_string.substr(filename1_as_string.find_last_of('/')+1); - string filename_as_string_no_path_no_extension = filename_as_string_no_path.substr(0,filename_as_string_no_path.length()-18); + string filename_as_string_no_path_no_extension = filename_as_string_no_path.substr(0,filename_as_string_no_path.length()-4); // Create a folder named AnalysisResults. Do not worry, nothing bad is going to happen if the folder already exists. string path_to_make = "mkdir -p "+analysis; @@ -295,7 +314,8 @@ gIVScan1->SetMarkerColor(kMagenta); gIVScan2->SetMarkerColor(kOrange); - TLegend *legIVScan = CreateLegend2(gIVScan1,"increasing V",gIVScan2,"decreasing V","epw",0.2,0.6,0.5,0.9); + // TLegend *legIVScan = CreateLegend2(gIVScan1,"increasing V",gIVScan2,"decreasing V","epw",0.2,0.6,0.5,0.9); + TLegend *legIVScan = CreateLegend2(gIVScan1,"18/03/2015",gIVScan2,"22/07/2014","epw",0.65,0.18,0.94,0.42); mgIVScan->Add(gIVScan1); mgIVScan->Add(gIVScan2); diff --git a/Software/Tools/SCurve.C b/Software/Tools/SCurve.C index a2bff2d..3560e9d 100644 --- a/Software/Tools/SCurve.C +++ b/Software/Tools/SCurve.C @@ -404,7 +404,7 @@ - else if ((filename == "ProcessRawData-201502253-216") || (filename == "ProcessRawData-20150226-216") || (filename == "ProcessRawData-201502262-216") || (filename == "ProcessRawData-20150226-100V-216") || (filename == "ProcessRawData-20150226-120V-216") || (filename == "ProcessRawData-20150226-140V-216") || (filename == "ProcessRawData-20150226-160V-216") || (filename == "ProcessRawData-20150226-180V-216") || (filename == "ProcessRawData-20150226-200V-216") || (filename == "ProcessRawData-20150227-21.0dB-216") || (filename == "ProcessRawData-20150227-21.5dB-216") || (filename == "ProcessRawData-20150227-22.0dB-216") || (filename == "ProcessRawData-20150227-22.5dB-216") || (filename == "ProcessRawData-20150227-23.0dB-216") || (filename == "ProcessRawData-20150227-23.5dB-216") || (filename == "ProcessRawData-20150227-24.0dB-216") || (filename == "ProcessRawData-20150227-24.5dB-216") || (filename == "ProcessRawData-20150227-25.0dB-216") || (filename == "ProcessRawData-20150309-67ns-216") || (filename == "ProcessRawData-20150309-68ns-216") || (filename == "ProcessRawData-20150309-69ns-216") ||(filename == "ProcessRawData-20150309-70ns-216") || (filename == "ProcessRawData-20150309-71ns-216") || (filename == "ProcessRawData-20150309-72ns-216") || (filename == "ProcessRawData-20150309-73ns-216") || (filename == "ProcessRawData-20150309-74ns-216") || (filename == "ProcessRawData-20150309-75ns-216") || (filename == "ProcessRawData-20150315-67ns-216") || (filename == "ProcessRawData-20150315-68ns-216") || (filename == "ProcessRawData-20150315-69ns-216") ||(filename == "ProcessRawData-20150315-70ns-216") || (filename == "ProcessRawData-20150315-71ns-216") || (filename == "ProcessRawData-20150315-72ns-216") || (filename == "ProcessRawData-20150315-73ns-216") || (filename == "ProcessRawData-20150315-74ns-216") || (filename == "ProcessRawData-20150315-75ns-216")) { + else if ((filename == "ProcessRawData-201502253-216") || (filename == "ProcessRawData-20150226-216") || (filename == "ProcessRawData-201502262-216") || (filename == "ProcessRawData-20150226-100V-216") || (filename == "ProcessRawData-20150226-120V-216") || (filename == "ProcessRawData-20150226-140V-216") || (filename == "ProcessRawData-20150226-160V-216") || (filename == "ProcessRawData-20150226-180V-216") || (filename == "ProcessRawData-20150226-200V-216") || (filename == "ProcessRawData-20150227-21.0dB-216") || (filename == "ProcessRawData-20150227-21.5dB-216") || (filename == "ProcessRawData-20150227-22.0dB-216") || (filename == "ProcessRawData-20150227-22.5dB-216") || (filename == "ProcessRawData-20150227-23.0dB-216") || (filename == "ProcessRawData-20150227-23.5dB-216") || (filename == "ProcessRawData-20150227-24.0dB-216") || (filename == "ProcessRawData-20150227-24.5dB-216") || (filename == "ProcessRawData-20150227-25.0dB-216") || (filename == "ProcessRawData-20150309-67ns-216") || (filename == "ProcessRawData-20150309-68ns-216") || (filename == "ProcessRawData-20150309-69ns-216") ||(filename == "ProcessRawData-20150309-70ns-216") || (filename == "ProcessRawData-20150309-71ns-216") || (filename == "ProcessRawData-20150309-72ns-216") || (filename == "ProcessRawData-20150309-73ns-216") || (filename == "ProcessRawData-20150309-74ns-216") || (filename == "ProcessRawData-20150309-75ns-216") || (filename == "ProcessRawData-20150315-67ns-216") || (filename == "ProcessRawData-20150315-68ns-216") || (filename == "ProcessRawData-20150315-69ns-216") ||(filename == "ProcessRawData-20150315-70ns-216") || (filename == "ProcessRawData-20150315-71ns-216") || (filename == "ProcessRawData-20150315-72ns-216") || (filename == "ProcessRawData-20150315-73ns-216") || (filename == "ProcessRawData-20150315-74ns-216") || (filename == "ProcessRawData-20150315-75ns-216") || (filename == "ProcessRawData-20150317-216")) { // Right. *minRight = 30.; *maxRight = 140.; @@ -538,7 +538,7 @@ // parSigma[17] = ?.; } - else if ((filename == "ProcessRawData-201502253-216") || (filename == "ProcessRawData-20150226-216")) { + else if ((filename == "ProcessRawData-201502253-216") || (filename == "ProcessRawData-20150226-216") || (filename == "ProcessRawData-20150317-216")) { // Sigma left. parSigma[0] = 0.01; parSigma[1] = 850.;