Status PXI

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index c10666157598ee7d0ed924483981b078ad4026c3..9291c9d0bb0554b5a80bd1ccebf121e50eb35ecc 100644 (file)
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -164,8 +164,8 @@ void ChargeSpektrum(TString runnumber = "")
                 }
                 runs[runi]->setResultsPath("./results/");
                 runs[runi]->useDynamicalNoise(true);
-    //             runs[runi]->analyzeFrame(542875); // creates or opens .root file, can analyze the RAW data
-                runs[runi]->error=runs[runi]->analyzeRun(false); // creates or opens .root file, can analyze the RAW data
+                 runs[runi]->analyzeFrame(100); // creates or opens .root file, can analyze the RAW data
+                runs[runi]->error=runs[runi]->analyzeRun(true); // creates or opens .root file, can analyze the RAW data
                 if (!runs[runi]->error)
                 {
             //         gROOT->SetBatch(kTRUE);

diff --git a/MABS_run_analyzer/MAPS.c b/MABS_run_analyzer/MAPS.c
index f988e77b02b80f7e8d1705ec815e72b1267ab408..a3eea54f4abd6eec31f60f16b146966e424d8688 100644 (file)
--- a/MABS_run_analyzer/MAPS.c
+++ b/MABS_run_analyzer/MAPS.c
@@ -1041,9 +1041,9 @@ bool MAPS::regetDynNoise(Int_t Frames) {
         }        
     }
     if (pedestalhighinthisframe)
-        cout<<"\rFrame: "<<fFrameNumber<< " --> Pedestal suspiciously high!"<<endl;
+    //    cout<<"\rFrame: "<<fFrameNumber<< " --> Pedestal suspiciously high!"<<endl;
     if (noisehighinthisframe)
-        cout<<"\rFrame: "<<fFrameNumber<< " --> Noise suspiciously high!"<<endl;
+    //    cout<<"\rFrame: "<<fFrameNumber<< " --> Noise suspiciously high!"<<endl;
     if (fFrameNumber%Frames == 0 && RefillNoiseBranch)
     {
         if(fSave)

diff --git a/MABS_run_analyzer/Run.c b/MABS_run_analyzer/Run.c
index 3fb01cda3c68638bdcba25f9cf8e9fb9f48c0601..3ad0ffe6364218ed9820eeddbcf123918cc01fd7 100644 (file)
--- a/MABS_run_analyzer/Run.c
+++ b/MABS_run_analyzer/Run.c
@@ -65,13 +65,17 @@ Run::Run(Int_t runnumber, Int_t loopi)
                 storepathRAWLinux = storepathRAWLinux.ReplaceAll("h:","/d/jspc53_H");
                 if (TString(hostname).EqualTo("jspc48"))
                 {
-                    storepathRAWLinux = storepathRAWLinux.ReplaceAll("U:","/d/jspc28/jspc53_U");
-                    storepathRAWLinux = storepathRAWLinux.ReplaceAll("u:","/d/jspc28/jspc53_U");                    
+                 //   storepathRAWLinux = storepathRAWLinux.ReplaceAll("U:","/d/jspc28/jspc53_U");
+                //    storepathRAWLinux = storepathRAWLinux.ReplaceAll("u:","/d/jspc28/jspc53_U");   
+              storepathRAWLinux = storepathRAWLinux.ReplaceAll("U:","/d/garlic");
+                storepathRAWLinux = storepathRAWLinux.ReplaceAll("u:","/d/garlic");                                    
                 }
                 else
                 {
-                    storepathRAWLinux = storepathRAWLinux.ReplaceAll("U:","/jspc53_U");
-                    storepathRAWLinux = storepathRAWLinux.ReplaceAll("u:","/jspc53_U");
+            //        storepathRAWLinux = storepathRAWLinux.ReplaceAll("U:","/jspc53_U");
+           //         storepathRAWLinux = storepathRAWLinux.ReplaceAll("u:","/jspc53_U");
+                                           storepathRAWLinux = storepathRAWLinux.ReplaceAll("U:","/d/garlic");
+                storepathRAWLinux = storepathRAWLinux.ReplaceAll("u:","/d/garlic");
                 }
                 storepathRAWLinux = storepathRAWLinux.ReplaceAll("F:","/jspc12_F");
                 storepathRAWLinux = storepathRAWLinux.ReplaceAll("f:","/jspc12_F");
@@ -358,8 +362,9 @@ Bool_t Run::analyzeFrame(Int_t frame)
             processed->getFrame(frame);
             processed->filterCommonMode();
             processed->hitana();
+                       
             processed->plotFrame(frame);
-            delete processed;
+                       delete processed;
             return 0;
         }
         else