add plots

diff --git a/s-curves/analysis_gui/ANA/Mi26Ana b/s-curves/analysis_gui/ANA/Mi26Ana
index 9428ed27e7c8c92657cae38bed1307ac957fd7d7..d0145bfa1e49a2905cca88f429fb712e93dee880 100755 (executable)
Binary files a/s-curves/analysis_gui/ANA/Mi26Ana and b/s-curves/analysis_gui/ANA/Mi26Ana differ

diff --git a/s-curves/analysis_gui/ANA/Mi26Ana.cpp b/s-curves/analysis_gui/ANA/Mi26Ana.cpp
index 8198408236c702f587ebdd98b585df35bfc83d6a..14402db9abaee353ae0212507b379f0c627dfb35 100644 (file)
--- a/s-curves/analysis_gui/ANA/Mi26Ana.cpp
+++ b/s-curves/analysis_gui/ANA/Mi26Ana.cpp
@@ -330,15 +330,20 @@ void Mi26Ana::fitsc() {                                                                                                                                   // ok
        histo[9]        = new TH1F( "chi21"     , "chi21"       , 1000,0.,1.);
        histo[10]       = new TH1F( "chi22"     , "chi22"       , 1000,0.,1.);
        histo[11]       = new TH1F( "chi23"     , "chi23"       , 1000,0.,1.);
-       
-       TF1* erf = new TF1("erf","0.5*(1+TMath::Erf((-x+[0])/[1]))",0,100);
-       
+       
+       TH2F* histo2[3];
+       histo2[0]       =  new TH2F( "mean2D","mean2D"  ,1152,0,1152,576,0,576);
+       histo2[1]       =  new TH2F( "sigma2D","sigma2D",1152,0,1152,576,0,576);
+       histo2[2]       =  new TH2F( "chi22D","chi22D",1152,0,1152,576,0,576);
+       
+       TF1* erf = new TF1("erf","0.5*(1+TMath::Erf((-x+[0])/[1]))",0,100);
+       
        float   mean = 0, sigma = 0, chi2 = 0;
-       int             chicount=0;
-       int             meanmin, meanmax;
-       float   meanmean;
-       float   vsigma;
-       float   vtmp=1;
+       int             chicount=0;
+       int             meanmin, meanmax;
+       float   meanmean;
+       float   vsigma;
+       float   vtmp=1;
        int     column;
        int             row;
        int             matrix;
@@ -349,8 +354,8 @@ void Mi26Ana::fitsc() {                                                                                                                                     // ok
 //     ULong_t progress_tmp=-1;
 //     Float_t         progress;
        
-       TCanvas* canv = new TCanvas("Error Function Fit","Error Function Fit",  50,100,750,300);
-       canv->Divide(3,1);
+       TCanvas* canv = new TCanvas("Error Function Fit","Error Function Fit",  50,100,750,450);
+       canv->Divide(3,2);
        
 // Read TTree
        for(int thr=0;thr<fNthr;thr++)
@@ -454,6 +459,10 @@ void Mi26Ana::fitsc() {                                                                                                                                    // ok
                                histo[4+matrix]->Fill(sigma);
                                histo[8+matrix]->Fill(chi2);
                                
+                               histo2[0]->Fill(column,row, mean);
+                               histo2[1]->Fill(column,row, sigma);
+                               histo2[2]->Fill(column,row, chi2);
+                               
                                if( mean        > MAXX[0] )     { MAXX[0]=mean+1;       }
                                if( sigma       > MAXX[1] )     { MAXX[1]=sigma+1;      }
                                if( chi2        > MAXX[2] )     { MAXX[2]=chi2+0.01;    }
@@ -530,6 +539,18 @@ void Mi26Ana::fitsc() {                                                                                                                                    // ok
                                        histo[11]->SetLineColor(4);
                                        histo[11]->SetStats(false);
                                        histo[11]->Draw("same");
+                                       
+//                                     canv->cd(4);
+//                                     histo2[0]->Draw("colz");
+//                                     histo2[0]->SetStats(false);
+//                                     
+//                                     canv->cd(5);
+//                                     histo2[1]->Draw("colz");
+//                                     histo2[1]->SetStats(false);
+//                                     
+//                                     canv->cd(6);
+//                                     histo2[2]->Draw("colz");
+//                                     histo2[2]->SetStats(false);
        
                                        canv->Update();
                                }
@@ -610,7 +631,19 @@ void Mi26Ana::fitsc() {                                                                                                                                    // ok
        histo[11]->SetLineColor(4);
        histo[11]->SetStats(false);
        histo[11]->Draw("same");
-
+       
+       canv->cd(4);
+       histo2[0]->Draw("colz");
+       histo2[0]->SetStats(false);
+       
+       canv->cd(5);
+       histo2[1]->Draw("colz");
+       histo2[1]->SetStats(false);
+       
+       canv->cd(6);
+       histo2[2]->Draw("colz");
+       histo2[2]->SetStats(false);
+       
        canv->Update();
        cout<<"\n-------------"<<endl;
 }
@@ -834,7 +867,25 @@ void Mi26Ana::sumup() {                                                                                                                                    // ok
 //####################################################################
 
 void Mi26Ana::fakes() {                                                                                                                                        // ok
-       
+//  --------------
+       const char *File        = fInputRootFile.Data();
+       char Filein [256]       = "";
+       char Fileout[256]       = "";
+       strcpy  (Filein, File);
+       uint namelength = strlen(Filein);
+       for(uint i=0; i<namelength-4;i++)
+       {
+               Fileout[i] = Filein[i];
+       }
+       strcat  (Fileout, "txt");
+       
+       fstream myfile;
+       myfile.open( Fileout , ios::out );
+       myfile<<setw(7)<<setprecision(0)<< "column";
+       myfile<<setw(7)<<setprecision(0)<< "row";
+       myfile<<setw(12)<<setprecision(0)<< "RMS";
+       myfile<<endl;
+//  --------------
        ULong_t progress_tmp=-1;
        Float_t         progress;
 //  --------------
@@ -886,7 +937,8 @@ void Mi26Ana::fakes() {                                                                                                                                     // ok
        plot[2] =  new TH1F( "RMS2","RMS2",1000,-1,1);
        plot[3] =  new TH1F( "RMS3","RMS3",1000,-1,1);
        TH2F* plot2 =  new TH2F( "RMS2D0","RMS2D",1152,0,1152,576,0,576);
-       TH2F* plot2a =  new TH2F( "RMS","RMS==0",1152,0,1152,576,0,576);
+       TH2F* plot2a =  new TH2F( "RMS21","RMS==0",1152,0,1152,576,0,576);
+       TH2F* plot2b =  new TH2F( "RMS22",Form("RMS<=%0.2f",fRMS),1152,0,1152,576,0,576);
        
        int MINX=fNthr,MAXX=0;
        
@@ -916,11 +968,24 @@ void Mi26Ana::fakes() {                                                                                                                                   // ok
                        plot[matrix]->Fill( mean[i] );
                        plot2           ->Fill( column, row, mean[i] );
                        
-                       if( mean[i]==0 && row!=573 && row!=0)
+                       if( mean[i]<=fRMS && row!=573 && row!=0)
                        {
-                               if(pixelprob_arr[pix*fNthr]==0) {pixelprob_arr[pix*fNthr]=0.01;}
-                               plot2a          ->Fill( column, row, pixelprob_arr[pix*fNthr] );
-                               cout<<"\r"<<column<<"\t"<<row<<"\t"<<pixelprob_arr[pix*fNthr]<<"\t"<<mean[i]  <<endl;
+                               myfile<<setw(7)<<setprecision(0)<< column;
+                               myfile<<setw(7)<<setprecision(0)<< row;
+                               myfile<<setw(12)<<setprecision(5)<< mean[i];
+                               myfile <<endl;
+       
+                               if( mean[i]==0 )
+                               {
+                                       if(pixelprob_arr[pix*fNthr]==0) {pixelprob_arr[pix*fNthr]=0.001;}
+                                       plot2a          ->Fill( column, row, pixelprob_arr[pix*fNthr] );
+                                       plot2b          ->Fill( column, row, 0.001 );
+//                                     cout<<"\r"<<column<<"\t"<<row<<"\t"<<pixelprob_arr[pix*fNthr]<<"\t"<<mean[i]  <<endl;
+                               }
+                               else
+                               {
+                                       plot2b          ->Fill( column, row, mean[i] );
+                               }
                        }
                }
                
@@ -943,6 +1008,10 @@ void Mi26Ana::fakes() {                                                                                                                                   // ok
        plot2->SetStats(false);
        plot2->Draw("colz");
        
+       cm2->cd(3);
+       plot2b->SetStats(false);
+       plot2b->Draw("colz");
+       
        cm2->cd(4);
        plot2a->SetStats(false);
        plot2a->Draw("colz");
@@ -955,13 +1024,10 @@ void Mi26Ana::fakes() {                                                                                                                                  // ok
                plot[i]->Draw("same");
        }
        
-       
-       
-       
-       
        cout<<"\r ...done for "<<fNthr<<" thresholds!                                       "<<endl;
        cout<<"-------------"<<endl;
-//     f->Close();
+       cout<<"Output: "<<Fileout<<endl,
+       myfile.close();
        cout<<"-------------"<<endl;
 }
 

diff --git a/s-curves/analysis_gui/ANA/Mi26Ana.h b/s-curves/analysis_gui/ANA/Mi26Ana.h
index 3c42044a2a81388ba31ca687ddfe5e56541115de..d7b015b45af5d9ac3a7a95b83655526227f1a621 100644 (file)
--- a/s-curves/analysis_gui/ANA/Mi26Ana.h
+++ b/s-curves/analysis_gui/ANA/Mi26Ana.h
@@ -51,6 +51,7 @@ private:
        int*    fRndPx;
        int             fNPx;
        int             fCode;
+       float   fRMS;
        
        TFile*          fFile;
        TTree*          fTree;
@@ -76,6 +77,7 @@ public:
        void setNRndPx  (int val)               { fNRndPx               = val;  }
        void setNPx             (int val)               { fNPx                  = val;  }
        void setCode    (int val)               { fCode                 = val;  }
+       void setRMS             (float val)             { fRMS                  = val;  }
 };
 
 #endif // Mi26Ana_H

diff --git a/s-curves/analysis_gui/ANA/main.cpp b/s-curves/analysis_gui/ANA/main.cpp
index 0ef5e108218c2bd3ab50ced1f5c356f66328eabe..4a012b354748e4359ec6be4adf5726c9c3ccba06 100644 (file)
--- a/s-curves/analysis_gui/ANA/main.cpp
+++ b/s-curves/analysis_gui/ANA/main.cpp
@@ -12,6 +12,7 @@ int main(int argc, char** argv) {
        int                     NPx;            // Pixelnummer
        int                     NRndPx;         // Amount of random pixels
        int                     Code;
+       float           RMS;
        
        stringstream strValue;
        
@@ -21,6 +22,7 @@ int main(int argc, char** argv) {
        if (argc>4) strValue<<argv[4]; strValue >> NPx;         strValue.clear();
        if (argc>5) strValue<<argv[5]; strValue >> NRndPx;      strValue.clear();
        if (argc>6) strValue<<argv[6]; strValue >> Code;        strValue.clear();
+       if (argc>7) strValue<<argv[7]; strValue >> RMS;         strValue.clear();       RMS = RMS/100.;
        
 //     cout<<" -- main 1 -- "<<endl;
 //     for(int i=0;i<7;i++)
@@ -45,6 +47,7 @@ int main(int argc, char** argv) {
        ana->setNRndPx  (NRndPx);
        ana->setNPx             (NPx);
        ana->setCode    (Code);
+       ana->setRMS             (RMS);
        ana->Exec               (Mode);
        delete ana;
        theApp.Run();

diff --git a/s-curves/analysis_gui/GUI/Makefile b/s-curves/analysis_gui/GUI/Makefile
index cff0ab3a8c90232f9287e140648fd1a91a630e7b..6c4ac96df258e059aa1918a091331eaddd0680ce 100644 (file)
--- a/s-curves/analysis_gui/GUI/Makefile
+++ b/s-curves/analysis_gui/GUI/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: scurves
-# Generated by qmake (2.01a) (Qt 4.8.5) on: Wed Oct 8 16:06:56 2014
+# Generated by qmake (2.01a) (Qt 4.8.5) on: Thu May 21 13:57:23 2015
 # Project:  scurves.pro
 # Template: app
 # Command: /usr/bin/qmake -o Makefile scurves.pro

diff --git a/s-curves/analysis_gui/GUI/main.o b/s-curves/analysis_gui/GUI/main.o
index 82ef639d356ef9fc74f134a7d7e4eae3973c7a01..f6ab568490e09c53b893d95409be0ca46a9cab5c 100644 (file)
Binary files a/s-curves/analysis_gui/GUI/main.o and b/s-curves/analysis_gui/GUI/main.o differ

diff --git a/s-curves/analysis_gui/GUI/runana.sh b/s-curves/analysis_gui/GUI/runana.sh
index 460cce38534b0be5618fbff01c17aa02548a5001..9781852242f2d2b4256958062de1998ed15a21e2 100755 (executable)
--- a/s-curves/analysis_gui/GUI/runana.sh
+++ b/s-curves/analysis_gui/GUI/runana.sh
@@ -1,7 +1,7 @@
 echo "Input: $1"
 # echo "Mode:   $2"
 rndmpxl=`pwd`/rndmpxl.ini
-time ./../ANA/Mi26Ana $1 $rndmpxl $2 $3 $4 $5
+time ./../ANA/Mi26Ana $1 $rndmpxl $2 $3 $4 $5 $6
 # echo "Finished!"
 # 
 # echo "./Mi26Ana $1 $rndmpxl $2 $3 $4 $5"
@@ -12,4 +12,5 @@ time ./../ANA/Mi26Ana $1 $rndmpxl $2 $3 $4 $5
 # echo $3
 # echo $4
 # echo $5
+# echo $6
 # echo "---------"
\ No newline at end of file

diff --git a/s-curves/analysis_gui/GUI/scurves b/s-curves/analysis_gui/GUI/scurves
index bd6ec77e47c309b046d4c56c3fe82d776e4f0a76..18b66e36916ae44afaf9dc061a0a4d8a5bf34c90 100755 (executable)
Binary files a/s-curves/analysis_gui/GUI/scurves and b/s-curves/analysis_gui/GUI/scurves differ

diff --git a/s-curves/analysis_gui/GUI/scurves.cpp b/s-curves/analysis_gui/GUI/scurves.cpp
index 6f0f4b576c0c1d58c3f151485ce6caecb112e5b3..bfd1700a7d4d25e8ea34fea30a3ddf64ff6ffeea 100644 (file)
--- a/s-curves/analysis_gui/GUI/scurves.cpp
+++ b/s-curves/analysis_gui/GUI/scurves.cpp
@@ -134,6 +134,8 @@ void scurves::initGUI() {
                spinRandPix     -> setValue( para );
                myfile >> para;
                spinPix         -> setValue( para );    calcRC(para);
+               myfile >> para;
+               spinRMS         -> setValue( 1.*para/100. );
 
                
        }
@@ -216,7 +218,8 @@ void scurves::Save() {
        myfile <<endl;
        
        myfile <<  spinRandPix  ->value()       <<" ";
-       myfile <<  spinPix                      ->value()       <<" ";
+       myfile <<  spinPix              ->value()       <<" ";
+       myfile <<  (int)(100.*spinRMS->value()) <<" ";
        myfile <<endl;
        
        myfile.close();
@@ -634,6 +637,10 @@ void scurves::RunAna(int method) {
        strstr4 << checkBank3->isChecked();
        strstr4 << checkBank4->isChecked();
        
+       std::stringstream strstr5;
+       strstr5.str("");
+       strstr5 << (int)((float)100.*spinRMS->value());
+       
        string command = "xterm -geometry 65x10+10+10 -e ./runana.sh ";
        command += " ";
        command += dirPath + filePath;
@@ -645,6 +652,8 @@ void scurves::RunAna(int method) {
        command += strstr3.str();
        command += " ";
        command += strstr4.str();
+       command += " ";
+       command += strstr5.str();
        
        const char *ptr = command.c_str() ;
 //     cout<<command<<endl;

diff --git a/s-curves/analysis_gui/GUI/scurves.ini b/s-curves/analysis_gui/GUI/scurves.ini
index 91fbb974c6204907473d21405c0075f225e32bc1..b5530b40eac079099ccea49e2405fa23d2fae037 100644 (file)
--- a/s-curves/analysis_gui/GUI/scurves.ini
+++ b/s-curves/analysis_gui/GUI/scurves.ini
@@ -1,4 +1,4 @@
 /local/samir/data/
-te15021111151_DST.root
+te15047175044.root
 1  1  1  1  0  1  
-10000 0 
+10000 0 1 

diff --git a/s-curves/analysis_gui/GUI/scurves.o b/s-curves/analysis_gui/GUI/scurves.o
index 6549feeb1d91a89729cb26c685aa0f8e027bb98d..9db0822a773bbf1bb39fb18d51cbbcab62a388c6 100644 (file)
Binary files a/s-curves/analysis_gui/GUI/scurves.o and b/s-curves/analysis_gui/GUI/scurves.o differ

diff --git a/s-curves/analysis_gui/GUI/scurves.ui b/s-curves/analysis_gui/GUI/scurves.ui
index 781dbd9e83a98496d5b2aa8c48dc6c8005340572..d44f3de72e91e76cb50864bb4f282c071cac8e56 100644 (file)
--- a/s-curves/analysis_gui/GUI/scurves.ui
+++ b/s-curves/analysis_gui/GUI/scurves.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>595</width>
-    <height>336</height>
+    <height>338</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -557,18 +557,63 @@
      <string>Sum</string>
     </property>
    </widget>
-   <widget class="QPushButton" name="pushFakes">
+   <widget class="QFrame" name="frame_5">
     <property name="geometry">
      <rect>
-      <x>300</x>
-      <y>205</y>
-      <width>95</width>
-      <height>51</height>
+      <x>297</x>
+      <y>201</y>
+      <width>101</width>
+      <height>111</height>
      </rect>
     </property>
-    <property name="text">
-     <string>RMS</string>
+    <property name="frameShape">
+     <enum>QFrame::StyledPanel</enum>
     </property>
+    <property name="frameShadow">
+     <enum>QFrame::Raised</enum>
+    </property>
+    <widget class="QPushButton" name="pushFakes">
+     <property name="geometry">
+      <rect>
+       <x>3</x>
+       <y>3</y>
+       <width>95</width>
+       <height>51</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>RMS</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_7">
+     <property name="geometry">
+      <rect>
+       <x>20</x>
+       <y>67</y>
+       <width>51</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>RMS &lt;=</string>
+     </property>
+    </widget>
+    <widget class="QDoubleSpinBox" name="spinRMS">
+     <property name="geometry">
+      <rect>
+       <x>15</x>
+       <y>81</y>
+       <width>71</width>
+       <height>23</height>
+      </rect>
+     </property>
+     <property name="maximum">
+      <double>0.990000000000000</double>
+     </property>
+     <property name="singleStep">
+      <double>0.010000000000000</double>
+     </property>
+    </widget>
    </widget>
   </widget>
   <widget class="QMenuBar" name="menubar">
@@ -577,7 +622,7 @@
      <x>0</x>
      <y>0</y>
      <width>595</width>
-     <height>20</height>
+     <height>21</height>
     </rect>
    </property>
   </widget>

diff --git a/s-curves/analysis_gui/GUI/ui_scurves.h b/s-curves/analysis_gui/GUI/ui_scurves.h
index 1acc06cfc86557444b5d9a37ee995fbd308a4542..2a073e325338810be1e3b2bd4c44720a34802d07 100644 (file)
--- a/s-curves/analysis_gui/GUI/ui_scurves.h
+++ b/s-curves/analysis_gui/GUI/ui_scurves.h
@@ -14,6 +14,7 @@
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QCheckBox>
+#include <QtGui/QDoubleSpinBox>
 #include <QtGui/QFrame>
 #include <QtGui/QHeaderView>
 #include <QtGui/QLabel>
@@ -71,7 +72,10 @@ public:
     QPushButton *pushRewrite;
     QPushButton *pushEmpty2;
     QPushButton *pushSum;
+    QFrame *frame_5;
     QPushButton *pushFakes;
+    QLabel *label_7;
+    QDoubleSpinBox *spinRMS;
     QMenuBar *menubar;
     QStatusBar *statusbar;
 
@@ -79,7 +83,7 @@ public:
     {
         if (MainWindow->objectName().isEmpty())
             MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
-        MainWindow->resize(595, 336);
+        MainWindow->resize(595, 338);
         centralwidget = new QWidget(MainWindow);
         centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
         lineDir = new QLineEdit(centralwidget);
@@ -219,13 +223,26 @@ public:
         pushSum = new QPushButton(centralwidget);
         pushSum->setObjectName(QString::fromUtf8("pushSum"));
         pushSum->setGeometry(QRect(300, 150, 95, 51));
-        pushFakes = new QPushButton(centralwidget);
+        frame_5 = new QFrame(centralwidget);
+        frame_5->setObjectName(QString::fromUtf8("frame_5"));
+        frame_5->setGeometry(QRect(297, 201, 101, 111));
+        frame_5->setFrameShape(QFrame::StyledPanel);
+        frame_5->setFrameShadow(QFrame::Raised);
+        pushFakes = new QPushButton(frame_5);
         pushFakes->setObjectName(QString::fromUtf8("pushFakes"));
-        pushFakes->setGeometry(QRect(300, 205, 95, 51));
+        pushFakes->setGeometry(QRect(3, 3, 95, 51));
+        label_7 = new QLabel(frame_5);
+        label_7->setObjectName(QString::fromUtf8("label_7"));
+        label_7->setGeometry(QRect(20, 67, 51, 16));
+        spinRMS = new QDoubleSpinBox(frame_5);
+        spinRMS->setObjectName(QString::fromUtf8("spinRMS"));
+        spinRMS->setGeometry(QRect(15, 81, 71, 23));
+        spinRMS->setMaximum(0.99);
+        spinRMS->setSingleStep(0.01);
         MainWindow->setCentralWidget(centralwidget);
         menubar = new QMenuBar(MainWindow);
         menubar->setObjectName(QString::fromUtf8("menubar"));
-        menubar->setGeometry(QRect(0, 0, 595, 20));
+        menubar->setGeometry(QRect(0, 0, 595, 21));
         MainWindow->setMenuBar(menubar);
         statusbar = new QStatusBar(MainWindow);
         statusbar->setObjectName(QString::fromUtf8("statusbar"));
@@ -275,6 +292,7 @@ public:
         pushEmpty2->setText(QApplication::translate("MainWindow", "Empty 2", 0, QApplication::UnicodeUTF8));
         pushSum->setText(QApplication::translate("MainWindow", "Sum", 0, QApplication::UnicodeUTF8));
         pushFakes->setText(QApplication::translate("MainWindow", "RMS", 0, QApplication::UnicodeUTF8));
+        label_7->setText(QApplication::translate("MainWindow", "RMS <=", 0, QApplication::UnicodeUTF8));
     } // retranslateUi
 
 };