--- PamelaLevel2/src/PamLevel2.cpp	2009/01/27 11:37:39	1.75
+++ PamelaLevel2/src/PamLevel2.cpp	2009/03/13 10:30:11	1.78
@@ -397,17 +397,17 @@
  * If no options are specified, the default is assumed. Default is:
  * +TRK2+CAL2+CAL1+TOF+TRG+ND+AC+S4+ORB
  */
-PamLevel2::PamLevel2(TString ddir,TString list,TString detlist){
+PamLevel2::PamLevel2(TString ddir,TString llist,TString detlist){
     Initialize();
-    TList*  listf = GetListOfLevel2Files(ddir,list);
-    GetPamTree(listf,detlist);
-    GetRunTree(listf);
+    TList*  listf = GetListOfLevel2Files(ddir,llist);
+    if(listf)GetPamTree(listf,detlist);
+    if(listf)GetRunTree(listf);
 };
 
-PamLevel2::PamLevel2(TString ddir,TList *list,TString detlist){
+PamLevel2::PamLevel2(TString ddir,TList *llist,TString detlist){
     Initialize();
-    GetPamTree(list,detlist);
-    GetRunTree(list);
+    GetPamTree(llist,detlist);
+    GetRunTree(llist);
 };
 /**
  * Constructor 
@@ -416,9 +416,9 @@
  * Default trees/branches are loaded. Default is:
  * +TRK2+CAL2+CAL1+TOF+TRG+ND+AC+S4+ORB
  */
-PamLevel2::PamLevel2(TString ddir,TString list){
+PamLevel2::PamLevel2(TString ddir,TString llist){
     Initialize();
-    TList*  listf = GetListOfLevel2Files(ddir,list);
+    TList*  listf = GetListOfLevel2Files(ddir,llist);
     GetPamTree(listf,"");
     GetRunTree(listf);
 };
@@ -1867,7 +1867,8 @@
 TList*  PamLevel2::GetListOfLevel2Files(TString ddir, TString flisttxt = ""){
 	
     TString wdir = gSystem->WorkingDirectory();	
-    
+//    cout << "Working directory: "<<wdir<<endl;
+
     //    if(ddir=="")ddir = wdir;
 //	TSystemDirectory *datadir = new TSystemDirectory(gSystem->BaseName(ddir),ddir);
     if ( ddir != ""){
@@ -1892,7 +1893,11 @@
 // 	flisttxt = fullpath;
 	if ( !flisttxt.EndsWith(".root") ){
 
-	    flisttxt = gSystem->ConcatFileName(gSystem->DirName(flisttxt),gSystem->BaseName(flisttxt));
+	    TString dir = gSystem->DirName(flisttxt);
+//	    cout << " List directory "<<dir<<endl;
+	    if(dir == "." || dir == "")
+		flisttxt = gSystem->ConcatFileName(wdir.Data(),gSystem->BaseName(flisttxt));
+//		flisttxt = gSystem->ConcatFileName(gSystem->DirName(flisttxt),gSystem->BaseName(flisttxt));
 
 	    if( !gSystem->ChangeDirectory(ddir) ){
 		cout << "Cannot change directory : "<<ddir<<endl;
@@ -1903,7 +1908,7 @@
 	    ifstream in; 
 	    in.open(flisttxt, ios::in); //open input file list
 	    if(!in.good()){ 
-		cout <<" ERROR opening the file "<<endl;
+		cout <<" TList*  PamLevel2::GetListOfLevel2Files(TString, TString) --> ERROR opening the file "<<endl;
 		gSystem->ChangeDirectory(wdir); // back to the working directory
 		return 0;
 	    }	
@@ -1957,6 +1962,7 @@
 
 	TSystemDirectory *datadir = new TSystemDirectory(gSystem->BaseName(ddir),ddir);
 	TList *temp = datadir->GetListOfFiles();
+	if(!temp)return 0;
 //		temp->Print();
 //		cout << "*************************************" << endl;
 	
@@ -2780,7 +2786,7 @@
 	    irunt = irun - irunoffset[run_tree->GetTreeNumber()];
 	    if ( gltsync ) delete gltsync; // Emiliano
 	    if(!dbc || (dbc && !dbc->IsConnected()) )SetDBConnection(); //Emiliano
-	    gltsync = new GL_TIMESYNC(GetRunInfo()->ID_ROOT_L0,"ID",dbc); // Emiliano
+	    gltsync = new GL_TIMESYNC(GetRunInfo()->ID_ROOT_L0,"ID",dbc,false); // Emiliano
 	    if ( dbc ) dbc->Close(); // Emiliano
 	    if(gltsync->DBobt(GetRunInfo()->RUNHEADER_OBT)>gltsync->DBobt(GetRunInfo()->RUNTRAILER_OBT) ){ // Emiliano
 		cout << "Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) -- WARNING -- irun "<<irun<<"  has RUNHEADER_OBT>=RUNTRAILER_OBT " <<endl;
@@ -3123,6 +3129,7 @@
     }
 
     TList *lk = f->GetListOfKeys();
+    if(!lk)return;
     TIter next(lk);
     TKey *key =0;
 
@@ -3445,7 +3452,7 @@
 	    if(GP){
 		Int_t nevt = ((TTree*)f->Get("h20"))->GetEntries();
 		if( nev && nevt!=nev){
-		    cout << "File: "<< f->GetName() <<" discarded ---- OrbitalInfo tree has "<<nevt<<" events instead of "<<nev<< endl; 
+		    cout << "File: "<< f->GetName() <<" discarded ---- h20 tree has "<<nevt<<" events instead of "<<nev<< endl; 
 		    return false;
 		}
 		nev=nevt;
@@ -3737,7 +3744,7 @@
     };
     // GPamela
     if(GP) {
-	pam_tree_clone[i] = new TTree("h20","PAMELA orbital info  ");	
+	pam_tree_clone[i] = new TTree("h20","GPAMELA info ");	
 	pam_tree_clone[i]->Branch("GPamela","GPamela", GetPointerTo("GPamela"),32000,1);//split
 	cout << "OrbitalInfo  : branch OrbitalInfo"<<endl;
 	i++;
@@ -3833,10 +3840,9 @@
     //-------------------------------
     ii = iee;
     if( !pam_tree->GetEntry(ii) ){	
-	cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- error reading pam tree"<<endl;
-	return 0;
+      cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- error reading pam tree"<<endl;
+      return 0;
     }
-
     //
     // ... that's way I put it here. Notice that nothing change in the code (is backward compatible) since in any case you return with 0. 
     // in theory one would like to return 1 if run is not loaded but now I don't have the will to add that 2 lines of code and it is not