--- PamelaDigitizer/Pamelagp2Digits.cxx	2008/06/06 15:16:08	1.10
+++ PamelaDigitizer/Pamelagp2Digits.cxx	2008/12/18 17:11:47	1.12
@@ -63,24 +63,11 @@
 //
 /////////////////////////////////////////////////////////////////////////
 
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "Riostream.h"
-#include "TFile.h"
-#include "TDirectory.h"
-#include "TTree.h"
-#include "TLeafI.h"
-#include "TH1.h"
-#include "TH2.h"
-#include "TProfile.h"
-#include "TGraph.h"
-#include "TMath.h"
 #include "Digitizer.h"
 
 using namespace std;
 
-int Error;   //to be removed soon
+//int Error;   //to be removed soon
 
 //  Define the names of the Fortran common blocks for the different OSs
 
@@ -282,7 +269,7 @@
 int main(int argc, char **argv)
 
 {
-  char* cha=DigitizerInfo(1);
+  //  char* cha=DigitizerInfo(1);
 
   if (argc < 2) {
      printf("Error: Pamelagp2Digits \n");
@@ -532,7 +519,8 @@
   }
   h1->SetEntries(nentries);
   h1->Write();
-  delete h1;
+  //  delete h1;
+  h1->Delete();
 }
 //____________________________________________________________________________
   void convert_cwn(Int_t id,char* file_raw)
@@ -845,38 +833,39 @@
 
   ifstream np("vectpar.dat",ios::in);
   if(!np)printf("ATTENTION: Using default vector legths!\n");
-  while(!np.eof()){
-    np>>q>>tmp;
-    if(np.eof())break;
-    if(tmp<=0){
-      cout<<"ATTENTION: Length of one vector is negative or equal 0!"<<endl<<q<<"="<<tmp<<endl;
-      break;
-    }
-    t=0;
-    while(tmp){
-      q1=ndl[t];
-      if(q[0]==q1[0] && q[1]==q1[1] && q[2]==q1[2] && q[3]==q1[3]){
-	par[t]=tmp;
-	tmp=0;
-	cout<<q<<" "<<par[t]<<"["<<t<<"]"<<endl;
+  else{
+    while(!np.eof()){
+      np>>q>>tmp;
+      if(np.eof())break;
+      if(tmp<=0){
+	cout<<"ATTENTION: Length of one vector is negative or equal 0!"<<endl<<q<<"="<<tmp<<endl;
+	break;
+      }
+      t=0;
+      while(tmp){
+	q1=ndl[t];
+	if(q[0]==q1[0] && q[1]==q1[1] && q[2]==q1[2] && q[3]==q1[3]){
+	  par[t]=tmp;
+	  tmp=0;
+	  cout<<q<<" "<<par[t]<<"["<<t<<"]"<<endl;
+	}
+	t++;
       }
-      t++;
     }
+    nspe=par[0];
+    ntof=par[1];
+    ncat=par[2];
+    ncas=par[3];
+    ncar=par[4];
+    ncal=par[5];
+    nnd=par[6];
+    nstr=par[7];
   }
-  nspe=par[0];
-  ntof=par[1];
-  ncat=par[2];
-  ncas=par[3];
-  ncar=par[4];
-  ncal=par[5];
-  nnd=par[6];
-  nstr=par[7];
-
   Digitizer* dig = new Digitizer(tree,file_raw,nspe,ntof,ncat,ncas,ncar,ncal,nnd,nstr);
   dig->Loop();
   dig->Close();
 
-  cout << "Finished" << endl << flush;
+  cout << "Finished" << endl;
 
 }